From 48f902c54545b51f29a9262a4a06d61d4e481e11 Mon Sep 17 00:00:00 2001
From: Daniel-Genkin <genkind@gmail.com>
Date: Mon, 2 Aug 2021 14:06:35 -0400
Subject: [PATCH] Attempt to download the tar file manually and include as a
 local file to the Helix payload

---
 src/libraries/sendtohelixhelp.proj | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 6bb24a0d05fb6..ca3f4bbcb7670 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -337,11 +337,6 @@
       <ChromeDriverUrl>https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chromedriver_win32.zip</ChromeDriverUrl>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(ForNode)' == 'true'">
-      <!-- Helix has an old version of Node that we don't support. So we send a valid version (current LTS) in the correlation payload -->
-      <NodeUrl>https://nodejs.org/dist/latest-v14.x/node-v14.17.4-linux-x64.tar.xz</NodeUrl>
-    </PropertyGroup>
-
     <PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
       <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoAotCrossDir), 'mono-aot-cross'))</_MonoAotCrossCompilerPath>
       <_MonoAotCrossCompilerPath Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(_MonoAotCrossCompilerPath).exe</_MonoAotCrossCompilerPath>
@@ -381,20 +376,29 @@
       <HelixCorrelationPayload Include="$(JsonToItemsTaskFactoryDir)"            Destination="build/JsonToItemsTaskFactory" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'BuildWasmApps'">
+    <ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'git logBuildWasmApps'">
       <HelixCorrelationPayload Include="$(TestEchoMiddleware)" Destination="xharness/TestEchoMiddleware" />
       <HelixCorrelationPayload Include="$(RemoteLoopMiddleware)" Destination="xharness/RemoteLoopMiddleware" />
     </ItemGroup>
 
+    <!-- Helix has an old version of Node that we don't support. So we send a valid version (current LTS) in the correlation payload -->
+    <NodeFolder Condition="'$(ForNode)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'nodejs'))</NodeFolder>
+    <DownloadFile Condition="'$(ForNode)' == 'true'"
+      SourceUrl="https://nodejs.org/dist/latest-v14.x/node-v14.17.4-linux-x64.tar.xz"
+      DestinationFolder="$(NodeFolder)"/>
+    <Exec Command="tar -xf node-v14.17.4-linux-x64.tar.xz"
+        WorkingDirectory="$(NodeFolder)"
+        IgnoreStandardErrorWarningFormat="true" 
+        Condition="'$(ForNode)' == 'true'"/>
+    <HelixCorrelationPayload Include="$(NodeFolder)/node-v14.17.4-linux-x64/bin" Condition="'$(ForNode)' == 'true'" />
+
     <ItemGroup Condition="'$(TargetOS)' != 'Android' and '$(TargetOS)' != 'iOS' and '$(TargetOS)' != 'iOSSimulator' and '$(TargetOS)' != 'tvOS' and '$(TargetOS)' != 'tvOSSimulator' and '$(TargetOS)' != 'MacCatalyst'">
       <HelixCorrelationPayload Include="$(HelixCorrelationPayload)"
                                Condition="'$(IncludeHelixCorrelationPayload)' == 'true' and '$(TargetOS)' != 'Browser'"
-                               AsArchive="$(HelixCorrelationPayload.EndsWith('.zip')) or $(HelixCorrelationPayload.EndsWith('.tar.xz'))" />
+                               AsArchive="$(HelixCorrelationPayload.EndsWith('.zip')))" />
       <HelixCorrelationPayload Include="chromium" Uri="$(ChromiumUrl)"         Condition="'$(NeedsToRunOnBrowser)' == 'true'" />
       <HelixCorrelationPayload Include="chromedriver" Uri="$(ChromeDriverUrl)" Condition="'$(NeedsToRunOnBrowser)' == 'true'" />
 
-       <HelixCorrelationPayload Include="nodejs" Uri="$(NodeUrl)" Condition="'$(ForNode)' == 'true'" />
-
       <_WorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
       <_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Console.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' != 'WasmTestOnBrowser' and '$(Scenario)' != 'BuildWasmApps'" />
       <_WorkItem Include="$(TestArchiveRoot)runonly/**/WebAssembly.Browser.*.Test.zip" Condition="'$(TargetOS)' == 'Browser' and '$(Scenario)' == 'WasmTestOnBrowser'" />