Browse Source

Remove DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER workaround (#44808)

Chris Ross 3 years ago
parent
commit
1d62cf9aa5

+ 0 - 2
.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
 

+ 0 - 6
.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 }}
 

+ 0 - 1
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)
             {