From 891f8c8e0857a2b18cf6d359ee70fa967fb7e861 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 23 Apr 2019 08:54:02 -0700
Subject: [PATCH] Unset environment variables for running SDK tests

---
 test/SdkTests/SdkTests.csproj | 36 +++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 8244e2468..aea540626 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -93,6 +93,12 @@
           DestinationFolder="$(TEMP)\dotnetSdkTests"
           SkipUnchangedFiles="true"
           />
+
+    <!-- Allow test list to be overridden with ToolTestName property -->
+    <ItemGroup Condition="'$(ToolTestName)' != ''">
+      <SdkTest Remove="@(SdkTest)" />
+      <SdkTest Include="$(ToolTestName)" />
+    </ItemGroup>
     
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="RunTestsAsTool"
@@ -115,7 +121,19 @@
     <Exec Command="dotnet new tool-manifest"
       WorkingDirectory="$(TestLocalToolFolder)"/>
 
-    <Exec Command="dotnet tool install --local $(ToolCommandName) --version $(MicrosoftNETSdkPackageVersion) --add-source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"
+    <PropertyGroup>
+      <SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion>
+      <SdkTestPackageFeed>https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</SdkTestPackageFeed>
+      
+      <InstallToolCommand>dotnet tool install --local $(ToolCommandName)</InstallToolCommand>
+      
+      <InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand>
+      <InstallToolCommand>$(InstallToolCommand) --add-source $(SdkTestPackageFeed)</InstallToolCommand>
+
+
+    </PropertyGroup>
+    
+    <Exec Command="$(InstallToolCommand)"
       WorkingDirectory="$(TestLocalToolFolder)"/>
 
     <Exec Command="dotnet tool restore"
@@ -133,10 +151,20 @@
       <TestArgs>$(TestArgs) &gt; $(ResultsStdOutPath)</TestArgs>
     </PropertyGroup>
 
-    <Exec Command="dotnet tool run $(ToolCommandName) -- $(TestArgs)"
+    <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+      <ToolRunPrefix>$(ToolRunPrefix)set MSBuildSDKsPath= &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)set DOTNET_HOST_PATH= &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)set DOTNET_INSTALLDIR= &amp;&amp; </ToolRunPrefix>      
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+      <ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_HOST_PATH &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
+    </PropertyGroup>
+
+    <Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
           WorkingDirectory="$(TestLocalToolFolder)"
-          IgnoreStandardErrorWarningFormat="true"
-          EnvironmentVariables="DOTNET_HOST_PATH=;DOTNET_INSTALLDIR="/>
+          IgnoreStandardErrorWarningFormat="true" />
   </Target>
   
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />