diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 940bb713331e1d..6dff5f9b455f77 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -12,22 +12,26 @@
     "correlation payload", which is the set of files used by all Helix submissions
     (which we compress into a single file).
 -->
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project Sdk="Microsoft.Build.NoTargets" InitialTargets="_SetTestArchiveRuntimeFile">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
-    <BuildTargetFramework>$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</BuildTargetFramework>
+    <BuildTargetFramework Condition="'$(BuildTargetFramework)' == ''">$(NetCoreAppCurrent)</BuildTargetFramework>
     <TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows>
 
-    <!-- The Helix correlation payload file -->
-    <TestArchiveRuntimeFile Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">$(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip</TestArchiveRuntimeFile>
-
     <!-- Set the name of the scenario file. Note that this is only used in invocations where $(Scenario) is set
          (which is when this project is invoked to call the "CreateOneScenarioTestEnvFile" target). -->
     <TestEnvFileName Condition=" '$(TargetsWindows)' == 'true' ">SetStressModes_$(Scenario).cmd</TestEnvFileName>
     <TestEnvFileName Condition=" '$(TargetsWindows)' != 'true' ">SetStressModes_$(Scenario).sh</TestEnvFileName>
 
   </PropertyGroup>
+  
+  <!-- The Helix correlation payload file -->
+  <Target Name="_SetTestArchiveRuntimeFile"
+          Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">
+    <PropertyGroup>
+      <TestArchiveRuntimeFile>$(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip</TestArchiveRuntimeFile>
+    </PropertyGroup>
+  </Target>
 
   <Target Name="RunInParallelForEachScenario"
           AfterTargets="Build">
@@ -83,12 +87,8 @@
     <MSBuild Projects="@(_ProjectsToBuild)" Targets="Test" BuildInParallel="$(_BuildInParallel)" StopOnFirstFailure="false" />
   </Target>
 
-  <PropertyGroup>
-  </PropertyGroup>
-
   <Target Name="CreateOneScenarioTestEnvFile">
     <!-- This target creates one __TestEnv file for the single $(Scenario). -->
-
     <Error Condition="'$(Scenario)' == ''" Text="No Scenario specified" />
 
     <PropertyGroup>
@@ -157,7 +157,6 @@
           Outputs="$(TestArchiveRuntimeFile)"
           Condition="'$(TargetsMobile)' != 'true' and
                      '$(TestArchiveRuntimeFile)' != ''">
-
     <!-- Compress the test files, testhost, and per-scenario scripts into a single ZIP file for sending to the Helix machines. -->
 
     <Message Importance="High" Text="Compressing runtime directory" />
@@ -168,7 +167,6 @@
     <ZipDirectory SourceDirectory="$(NetCoreAppCurrentTestHostPath)"
                   DestinationFile="$(TestArchiveRuntimeFile)"
                   Overwrite="true" />
-
   </Target>
 
   <!--