From 4c500699b938d53993b928b93543b8dbe68f69aa Mon Sep 17 00:00:00 2001
From: Bruce Forstall <brucefo@microsoft.com>
Date: Wed, 10 Jan 2024 21:28:53 -0800
Subject: [PATCH] Move setting variables to HelixPreCommands (#96713)

Move setting `__TestArchitecture` variable to HelixPreCommands

In particular, restore the RunTests.cmd script as being architecture-independent.
---
 eng/testing/tests.targets                    | 3 ---
 src/libraries/sendtohelixhelp.proj           | 8 ++++++++
 src/tests/Common/helixpublishwitharcade.proj | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index e61615a2628379..d2a13edf8555cc 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -72,10 +72,7 @@
   <ItemGroup Condition="'$(IsXUnitLogCheckerSupported)' == 'true' and
                         '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">
-    <SetScriptCommands Condition="'$(TargetOS)' == 'windows'" Include="set __TestArchitecture=$(TargetArchitecture)" />
     <SetScriptCommands Condition="'$(TargetOS)' == 'windows'" Include="set __IsXUnitLogCheckerSupported=1" />
-
-    <SetScriptCommands Condition="'$(TargetOS)' != 'windows'" Include="export __TestArchitecture=$(TargetArchitecture)" />
     <SetScriptCommands Condition="'$(TargetOS)' != 'windows'" Include="export __IsXUnitLogCheckerSupported=1" />
   </ItemGroup>
 
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 4eadeb38244998..910cf44926098d 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -115,6 +115,14 @@
        setting up the per-scenario environment.
   -->
 
+  <ItemGroup Condition=" '$(TargetOS)' == 'windows' ">
+    <HelixPreCommand Include="set __TestArchitecture=$(TargetArchitecture)" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetOS)' != 'windows' ">
+    <HelixPreCommand Include="export __TestArchitecture=$(TargetArchitecture)" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TestEnvFileName)' != '' and '$(TargetOS)' == 'windows' ">
     <HelixPreCommand Include="set __TestEnv=%HELIX_CORRELATION_PAYLOAD%\$(TestEnvFileName)" />
     <HelixPreCommand Include="type %__TestEnv%" />
diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index b6774b669c18db..557e5e55beea90 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -709,7 +709,7 @@
     <HelixPreCommand Include="export __TestCollectionTimeoutMins=$(TimeoutPerTestCollectionInMinutes)" Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' " />
     <HelixPreCommand Include="export __CollectDumps=1" />
     <HelixPreCommand Include="export __CrashDumpFolder=$HELIX_DUMP_FOLDER" />
-    <HelixPreCommand Include="set __TestArchitecture=$(TargetArchitecture)" />
+    <HelixPreCommand Include="export __TestArchitecture=$(TargetArchitecture)" />
     <HelixPreCommand Include="cat $__TestEnv" />
 
     <HelixPostCommand Include="find $HELIX_WORKITEM_PAYLOAD -name '*testResults.xml' -exec cp {} $HELIX_DUMP_FOLDER\; " />