Skip to content

Commit d0c81b5

Browse files
committed
wip
1 parent 3c7d4c1 commit d0c81b5

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed

eng/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ done
1515
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1616

1717
export MSBUILDUSESERVER=1
18+
export DOTNET_CLI_USE_MSBUILD_SERVER=1
1819

1920
usage()
2021
{

eng/common/tools.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,8 @@ function MSBuild {
470470
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
471471
export MSBUILDUSESERVER=1
472472
Write-PipelineSetVariable -name "MSBUILDUSESERVER" -value "1"
473+
export DOTNET_CLI_USE_MSBUILD_SERVER=1
474+
Write-PipelineSetVariable -name "DOTNET_CLI_USE_MSBUILD_SERVER" -value "1"
473475
fi
474476

475477
local toolset_dir="${_InitializeToolset%/*}"

eng/pipelines/common/global-build-job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ jobs:
8585
value: "1"
8686
- name: "env:MSBUILDUSESERVER"
8787
value: "1"
88+
- name: "DOTNET_CLI_USE_MSBUILD_SERVER"
89+
value: "1"
90+
- name: "env:DOTNET_CLI_USE_MSBUILD_SERVER"
91+
value: "1"
8892
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
8993
- group: DotNet-HelixApi-Access
9094
- group: AzureDevOps-Artifact-Feeds-Pats

eng/pipelines/common/templates/global-build-step.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ steps:
1515
displayName: ${{ parameters.displayName }}
1616
env:
1717
MSBUILDUSESERVER: '1'
18+
DOTNET_CLI_USE_MSBUILD_SERVER: '1'
1819
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
1920
continueOnError: ${{ parameters.shouldContinueOnError }}
2021
${{ if ne(parameters.container, '') }}:

src/installer/tests/TestUtils/DotNetCli.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ public Command Exec(string command, params string[] args)
4646
newArgs.Insert(0, command);
4747

4848
return Command.Create(DotnetExecutablePath, newArgs)
49-
.EnvironmentVariable("MSBUILDUSESERVER", "1")
49+
.EnvironmentVariable("MSBUILDUSESERVER", "1")
50+
.EnvironmentVariable("DOTNET_CLI_USE_MSBUILD_SERVER", "1")
5051
.EnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1")
5152
.MultilevelLookup(false); // Avoid looking at machine state by default
5253
}

0 commit comments

Comments
 (0)