From 17e58e57d5417568655c246217b1c6eeb0aa4939 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 29 Jan 2019 00:16:01 +0100
Subject: [PATCH] Make global tools work with helix

---
 .../build/core/Core.props                     |  6 +++++
 .../build/core/Core.targets                   | 22 +++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props b/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props
index 16240988beb..624e2078804 100644
--- a/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props
+++ b/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.props
@@ -11,6 +11,12 @@
   <ItemGroup Condition="'$(BuildingNETFxVertical)' == 'true'">
     <RunScriptCommands Include="set DEVPATH=%RUNTIME_PATH%" />
   </ItemGroup>
+
+  <!-- Set DOTNET_ROOT to route global tools shims to the correct host. -->
+  <ItemGroup Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
+    <RunScriptCommands Condition="'$(TargetOS)' == 'Windows_NT'" Include="set DOTNET_ROOT=$(RunScriptHostDir)" />
+    <RunScriptCommands Condition="'$(TargetOS)' != 'Windows_NT'" Include="export DOTNET_ROOT=$(RunScriptHostDir)" />
+  </ItemGroup>
   
   <!-- Binplace dirs for supplemental test data. -->
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.targets b/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.targets
index dfac730dca1..eab119d124d 100644
--- a/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.targets
+++ b/src/Microsoft.DotNet.CoreFxTesting/build/core/Core.targets
@@ -15,7 +15,6 @@
     <CleanDependsOn>$(CleanDependsOn);CleanTestPath;</CleanDependsOn>
   </PropertyGroup>
 
-  <!-- RunScript -->
   <PropertyGroup>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Windows_NT'">RunnerTemplate.Windows.txt</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' != 'Windows_NT'">RunnerTemplate.Unix.txt</RunScriptInputName>
@@ -24,11 +23,15 @@
     <RunScriptOutputName Condition="'$(TargetOS)' == 'Windows_NT'">RunTests.cmd</RunScriptOutputName>
     <RunScriptOutputName Condition="'$(TargetOS)' != 'Windows_NT'">RunTests.sh</RunScriptOutputName>
     <RunScriptOutputPath>$([MSBuild]::NormalizePath('$(TestPath)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
+  </PropertyGroup>
 
-    <RunScriptHostDir Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' == 'Windows_NT'">%RUNTIME_PATH%\</RunScriptHostDir>
-    <RunScriptHostDir Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
-    <RunScriptHost Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' == 'Windows_NT'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
-    <RunScriptHost Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
+  <PropertyGroup Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
+    <RunScriptHostDir Condition="'$(TargetOS)' == 'Windows_NT'">%RUNTIME_PATH%\</RunScriptHostDir>
+    <RunScriptHostDir Condition="'$(TargetOS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
+    <RunScriptHost Condition="'$(TargetOS)' == 'Windows_NT'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
+    <RunScriptHost Condition="'$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
+    
+    <GlobalToolsDir Condition="'$(ArchiveTests)' == 'true'">$(RunScriptHostDir)</GlobalToolsDir>
   </PropertyGroup>
 
   <Target Name="PublishSupplementalTestData"
@@ -59,12 +62,7 @@
 
   </Target>
 
-  <!--
-    Archive test binaries along with supporting files.
-
-    Inputs:
-      - TestArchiveTestsDir: Expected to bet set in Directory.Build.props.
-  -->
+  <!-- Archive test binaries along with supporting files. -->
   <Target Name="ArchiveTestBuild"
           DependsOnTargets="GenerateRunScript"
           Condition="'$(ArchiveTests)' == 'true'">
@@ -257,7 +255,7 @@
 
   <!--
     Code Coverage support.
-    Supported runners: OpenCover.
+    Supported runners: coverlet.
 
     Inputs:
       - Coverage: Expected to be passed in as a global property.