diff options
| author | Chris Ross <Tratcher@Outlook.com> | 2022-11-01 21:28:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 21:28:33 +0300 |
| commit | 1d62cf9aa5e26274bb4d1993c35ae101d27c8d54 (patch) | |
| tree | b240971fd7ce415a27314e8f69f181de1d9d8bda | |
| parent | 96df232d353a3bb44c5c7fb0c500ec2c536e16db (diff) | |
Remove DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER workaround (#44808)
| -rw-r--r-- | .azure/pipelines/ci.yml | 2 | ||||
| -rw-r--r-- | .azure/pipelines/jobs/default-build.yml | 6 | ||||
| -rw-r--r-- | eng/tools/HelixTestRunner/TestRunner.cs | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 51f266471a..0c9ea523f7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -794,8 +794,6 @@ stages: jobProperties: timeoutInMinutes: 120 variables: - # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary - DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true # Log environment variables in binary logs to ease debugging MSBUILDLOGALLENVIRONMENTVARIABLES: true diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index c153355399..ee0110ef2c 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -251,8 +251,6 @@ jobs: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary - DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true # Expand provided `env:` properties, if any. ${{ if step.env }}: ${{ step.env }} @@ -265,8 +263,6 @@ jobs: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary - DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true - ${{ if ne(parameters.agentOs, 'Windows') }}: - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs) displayName: Run build.sh @@ -274,8 +270,6 @@ jobs: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary - DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true - ${{ parameters.afterBuild }} diff --git a/eng/tools/HelixTestRunner/TestRunner.cs b/eng/tools/HelixTestRunner/TestRunner.cs index f25906d1e0..30285e90ee 100644 --- a/eng/tools/HelixTestRunner/TestRunner.cs +++ b/eng/tools/HelixTestRunner/TestRunner.cs @@ -36,7 +36,6 @@ public class TestRunner ProcessUtil.PrintMessage($"Set VSTEST_DUMP_PATH: {dumpPath}"); EnvironmentVariables.Add("VSTEST_DUMP_PATH", dumpPath); EnvironmentVariables.Add("DOTNET_CLI_VSTEST_TRACE", "1"); - EnvironmentVariables.Add("DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER", "1"); if (Options.InstallPlaywright) { |