From 5e326fc23d94ba872b0b9c437e589fd6f8092b46 Mon Sep 17 00:00:00 2001
From: Viktor <viktor.hofer@microsoft.com>
Date: Tue, 29 Jan 2019 00:17:45 +0100
Subject: [PATCH 1/2] Make global tools work with helix

---
 eng/sendtohelix.proj | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj
index 925c3afd86a4..280f5c76b93d 100644
--- a/eng/sendtohelix.proj
+++ b/eng/sendtohelix.proj
@@ -85,6 +85,19 @@
           Outputs="$(TestArchiveRuntimeFile)"
           Condition="'$(TargetGroup)' != 'AllConfigurations'">
 
+    <!-- Add global tools -->
+    <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+      <TestArchiveRuntimeDependencies Include="$(GlobalToolsDir)**\*.*" />
+    </ItemGroup>
+
+    <!-- Copy additional test dependencies. -->
+    <Copy SourceFiles="@(TestArchiveRuntimeDependencies)"
+          DestinationFolder="$(TestHostRootPath)\%(RecursiveDir)"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="true"
+          Retries="3"
+          RetryDelayMilliseconds="300" />
+
     <MakeDir Directories="$(TestArchiveRuntimeRoot)" />
     <ZipDirectory
         SourceDirectory="$(TestHostRootPath)"

From 327621abec112991305dfa9df20e999e6d674412 Mon Sep 17 00:00:00 2001
From: Viktor <viktor.hofer@microsoft.com>
Date: Tue, 29 Jan 2019 12:31:57 +0100
Subject: [PATCH 2/2] Add runtime dependencies as target inputs

---
 eng/sendtohelix.proj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj
index 280f5c76b93d..c34424e94f7f 100644
--- a/eng/sendtohelix.proj
+++ b/eng/sendtohelix.proj
@@ -80,16 +80,16 @@
     <_RuntimeInputs Include="$(TestHostRootPath)**/*.dll" />
   </ItemGroup>
 
+  <!-- Add global tools to runtime -->
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <TestArchiveRuntimeDependencies Include="$(GlobalToolsDir)**\*.*" />
+  </ItemGroup>
+
   <Target Name="CompressRuntimeDirectory"
-          Inputs="@(_RuntimeInputs)"
+          Inputs="@(_RuntimeInputs);@(TestArchiveRuntimeDependencies)"
           Outputs="$(TestArchiveRuntimeFile)"
           Condition="'$(TargetGroup)' != 'AllConfigurations'">
 
-    <!-- Add global tools -->
-    <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
-      <TestArchiveRuntimeDependencies Include="$(GlobalToolsDir)**\*.*" />
-    </ItemGroup>
-
     <!-- Copy additional test dependencies. -->
     <Copy SourceFiles="@(TestArchiveRuntimeDependencies)"
           DestinationFolder="$(TestHostRootPath)\%(RecursiveDir)"