From be82bda306227ce43a20af9ae1fbcc2ce848e8ff Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 10 Sep 2019 13:41:34 -0700
Subject: [PATCH] Set DOTNET_CLI_HOME when running local tools

---
 test/SdkTests/SdkTests.csproj | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 24c63b0dd..d68bdf9c6 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -27,6 +27,7 @@
     <RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
     <DotnetToTestPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\</DotnetToTestPath>
     <TestExecutionDirectory>$([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests'))</TestExecutionDirectory>
+    <DOTNET_CLI_HOME>$(ArtifactsTmpDir)DOTNET_CLI_HOME\</DOTNET_CLI_HOME>
   </PropertyGroup>
 
   <ItemGroup>
@@ -203,7 +204,8 @@
     </PropertyGroup>
     
     <Exec Command="$(ToolRunPrefix)dotnet new tool-manifest"
-      WorkingDirectory="$(TestLocalToolFolder)"/>
+      WorkingDirectory="$(TestLocalToolFolder)"
+      EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
 
     <PropertyGroup>
       <SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion>
@@ -216,10 +218,12 @@
     </PropertyGroup>
     
     <Exec Command="$(ToolRunPrefix)$(InstallToolCommand)"
-      WorkingDirectory="$(TestLocalToolFolder)"/>
+      WorkingDirectory="$(TestLocalToolFolder)"
+      EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
 
-    <Exec Command="$(ToolRunPrefix)dotnet tool restore"
-      WorkingDirectory="$(TestLocalToolFolder)"/>
+    <!--<Exec Command="$(ToolRunPrefix)dotnet tool restore"
+      WorkingDirectory="$(TestLocalToolFolder)"
+      EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>-->
 
     <PropertyGroup>
       <ResultsXmlPath>$(ArtifactsTestResultsDir)$(TestProjectName).xml</ResultsXmlPath>
@@ -243,7 +247,8 @@
     </PropertyGroup>
 
     <Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
-          WorkingDirectory="$(TestLocalToolFolder)" />
+          WorkingDirectory="$(TestLocalToolFolder)"
+          EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
   </Target>
   
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />