Merge pull request #3807 from wli3/revert-node-reuse

Revert node reuse
dotnet · Oct 28, 2019 · 3348124 · 3348124
2 parents 34097cd + 90956bc
commit 3348124
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -52,6 +52,20 @@ stages:
               _SignType: real
               _Test: ''
 
+  - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+    - template: /eng/build.yml
+      parameters:
+        agentOs: Windows_Perf_Helix
+        pool:
+          name: Hosted VS2017
+        strategy:
+          matrix:
+            Build_Release:
+              _BuildConfig: Release
+              _PublishType: none
+              _SignType: test
+              _DotNetPublishToBlobFeed: false
+
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
     - template: /eng/build.yml
       parameters:

diff --git a/eng/dogfood.ps1 b/eng/dogfood.ps1
@@ -42,7 +42,6 @@ try {
   $env:NETCoreSdkBundledVersionsProps = Join-Path $env:DOTNET_INSTALL_DIR "sdk\$env:SDK_CLI_VERSION\Microsoft.NETCoreSdk.BundledVersions.props"
   $env:MicrosoftNETBuildExtensionsTargets = Join-Path $env:MSBuildSDKsPath "Microsoft.NET.Build.Extensions\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\Microsoft.NET.Build.Extensions.targets"
   $env:DOTNET_ROOT = $env:DOTNET_INSTALL_DIR
-  $env:MSBUILDNODEHANDSHAKESALT  = "Test Environment for dotnet/sdk"
 
   if ($command -eq $null -and $env:DOTNET_SDK_DOGFOOD_SHELL -ne $null) {
     $command = , $env:DOTNET_SDK_DOGFOOD_SHELL

diff --git a/eng/dogfood.sh b/eng/dogfood.sh
@@ -22,4 +22,3 @@ export MSBuildSDKsPath="$artifacts_dir/bin/$configuration/Sdks"
 export DOTNET_MSBUILD_SDK_RESOLVER_SDKS_DIR="$MSBuildSDKsPath"
 export NETCoreSdkBundledVersionsProps="$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version/Microsoft.NETCoreSdk.BundledVersions.props"
 export MicrosoftNETBuildExtensionsTargets="$MSBuildSDKsPath/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets"
-export MSBUILDNODEHANDSHAKESALT="Test Environment for dotnet/sdk"
diff --git a/src/Tests/Microsoft.NET.TestFramework/TestContext.cs b/src/Tests/Microsoft.NET.TestFramework/TestContext.cs
@@ -59,8 +59,8 @@ public void AddTestEnvironmentVariables(SdkCommandSpec command)
             command.Environment["GenerateResourceMSBuildArchitecture"] = "CurrentArchitecture";
             command.Environment["GenerateResourceMSBuildRuntime"] = "CurrentRuntime";
 
-            //  Use distinct nodes for test environment
-            command.Environment["MSBUILDNODEHANDSHAKESALT"] = "Test Environment for dotnet/sdk";
+            //  Prevent test MSBuild nodes from persisting
+            command.Environment["MSBUILDDISABLENODEREUSE"] = "1";
 
             ToolsetUnderTest.AddTestEnvironmentVariables(command);
         }