From 2d7588a88acc8c9447194caa7c315c5b6352f67b Mon Sep 17 00:00:00 2001
From: Gleb Balykov <g.balykov@samsung.com>
Date: Tue, 3 Mar 2020 22:38:48 +0300
Subject: [PATCH] Build CoreCLR tests as platform independent (AnyCPU) (#32916)

* Build platform independent tests dlls

* Fix tests exclusion conditions

* Fix windows specific dirs
---
 src/coreclr/tests/dir.common.props                             |  2 +-
 src/coreclr/tests/dir.sdkbuild.props                           |  2 +-
 src/coreclr/tests/src/Directory.Build.props                    |  2 +-
 .../src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj     |  2 +-
 src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj  |  2 +-
 .../tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj     |  2 +-
 .../tests/src/GC/Scenarios/ServerModel/servermodel.csproj      |  2 +-
 .../CopyConstructorMarshaler/CopyConstructorMarshaler.csproj   |  2 +-
 .../FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj   |  2 +-
 .../IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj |  2 +-
 .../IJW/ManagedCallingNative/ManagedCallingNative.csproj       |  2 +-
 .../IJW/NativeCallingManaged/NativeCallingManaged.csproj       |  2 +-
 .../src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj     |  4 ++--
 src/coreclr/tests/src/Interop/Interop.settings.targets         |  6 +++---
 .../Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj |  2 +-
 .../tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj    |  2 +-
 .../IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj   |  4 ++--
 .../tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj        |  2 +-
 .../tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj        |  2 +-
 .../tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj      |  4 ++--
 .../JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj  | 10 +++++-----
 .../Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj   |  2 +-
 .../tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj     |  4 ++--
 .../tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj     |  4 ++--
 src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj       |  2 +-
 src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj      |  2 +-
 .../coreroot_determinism/coreroot_determinism.csproj           |  2 +-
 .../tests/src/readytorun/crossgen2/crossgen2smoke.csproj       |  2 +-
 .../src/readytorun/determinism/crossgen2determinism.csproj     |  2 +-
 src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj    |  2 +-
 30 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props
index 4382aa1..41c42a2 100644
--- a/src/coreclr/tests/dir.common.props
+++ b/src/coreclr/tests/dir.common.props
@@ -10,7 +10,7 @@
        tests/dir.props directly - these should eventually go away. -->
 
   <PropertyGroup>
-    <OSPlatformConfig>$(BuildOS).$(Platform).$(Configuration)</OSPlatformConfig>
+    <OSPlatformConfig>$(BuildOS).$(BuildArch).$(Configuration)</OSPlatformConfig>
 
     <TestSrcDir>$(MSBuildThisFileDirectory)src</TestSrcDir>
     <BuildProjectRelativeDir>$([MSBuild]::MakeRelative($(TestSrcDir), $(MSBuildProjectDirectory)))\$(MSBuildProjectName)\</BuildProjectRelativeDir>
diff --git a/src/coreclr/tests/dir.sdkbuild.props b/src/coreclr/tests/dir.sdkbuild.props
index 5a6d532..7e0c081 100644
--- a/src/coreclr/tests/dir.sdkbuild.props
+++ b/src/coreclr/tests/dir.sdkbuild.props
@@ -9,7 +9,7 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <Platform>$(BuildArch)</Platform>
+    <Platform>AnyCPU</Platform>
 
     <!-- [ARCADE REMOVE] This line should be removed we use the Arcade Sdk. -->
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props
index 4d63321..00d5ce2 100644
--- a/src/coreclr/tests/src/Directory.Build.props
+++ b/src/coreclr/tests/src/Directory.Build.props
@@ -30,7 +30,7 @@
     <BinDir>$(BaseOutputPathWithConfig)</BinDir>
     <BaseIntermediateOutputPath>$(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath>
     <BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath>
-    <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(Platform).$(Configuration)\Native\))</__NativeTestIntermediatesDir>
+    <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(BuildArch).$(Configuration)\Native\))</__NativeTestIntermediatesDir>
     <BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir>
     <BuildProjectRelativeDir Condition="'$(MSBuildProjectDirectory.Contains($(TestSourceDir)))'">$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(TestSourceDir),''))\$(MSBuildProjectName)</BuildProjectRelativeDir>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\</IntermediateOutputPath>
diff --git a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj
index 7464113..e29d631 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'arm'">true</HeapVerifyIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'arm'">true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj
index 57df5c4..b56eadc 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'arm'">true</HeapVerifyIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'arm'">true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
diff --git a/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj b/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj
index e8f3e88..9230aa5 100644
--- a/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj
+++ b/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'arm' or '$(Platform)' == 'arm64'">true</HeapVerifyIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86' or '$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">true</HeapVerifyIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj b/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj
index e1bec38..418639a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <CLRTestExecutionArguments>/numrequests:100</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'arm' or '$(Platform)' == 'arm64'">true</HeapVerifyIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86' or '$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">true</HeapVerifyIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cache.cs" />
diff --git a/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj b/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj
index c7a0eca..5a392a9 100644
--- a/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj
@@ -7,7 +7,7 @@
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <!-- IJW is not supported on ARM64 -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- Loading IJW assemblies into an unloadable context is not allowed -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj b/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj
index 3734d92..84e494d 100644
--- a/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj
@@ -7,7 +7,7 @@
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <!-- IJW is not supported on ARM64 -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- Loading IJW assemblies into an unloadable context is not allowed -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj b/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj
index 071b9ff..c57c638 100644
--- a/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj
@@ -9,7 +9,7 @@
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <!-- IJW is not supported on ARM64 -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- Loading IJW assemblies into an unloadable context is not allowed -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj b/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj
index a0b5921..033a266 100644
--- a/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj
@@ -7,7 +7,7 @@
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <!-- IJW is not supported on ARM64 -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- Loading IJW assemblies into an unloadable context is not allowed -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj b/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj
index fb0e9d8..eb21075 100644
--- a/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj
@@ -7,7 +7,7 @@
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <!-- IJW is not supported on ARM64 -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- Loading IJW assemblies into an unloadable context is not allowed -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj b/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj
index 231e66e..1c0cd49 100644
--- a/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj
@@ -7,9 +7,9 @@
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <!-- IJW is not supported on ARM64 -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- Native varargs not supported on ARM -->
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm'">true</DisableProjectBuild>
     <!-- Loading IJW assemblies into an unloadable context is not allowed -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/Interop.settings.targets b/src/coreclr/tests/src/Interop/Interop.settings.targets
index c26170b..a9d550e 100644
--- a/src/coreclr/tests/src/Interop/Interop.settings.targets
+++ b/src/coreclr/tests/src/Interop/Interop.settings.targets
@@ -22,8 +22,8 @@
   <ItemGroup
     Condition="'$(TargetsWindows)' == 'true' And ('$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Checked') And '$(CopyDebugCRTDllsToOutputDirectory)' == 'true'" >
 
-    <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/vcruntime*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
-    <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/msvcp*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
-    <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always" />
+    <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(BuildArch)/Microsoft.VC*.DebugCRT/vcruntime*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+    <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(BuildArch)/Microsoft.VC*.DebugCRT/msvcp*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+    <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(BuildArch)/ucrtbased.dll" CopyToOutputDirectory="Always" />
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj b/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj
index d94f3ce..5f17399 100644
--- a/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj
+++ b/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj
@@ -4,7 +4,7 @@
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm' or '$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
     <!-- WinRT interop is not compatible with unloadability -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj b/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj
index 2f5a590..4ac8db8 100644
--- a/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj
@@ -6,7 +6,7 @@
     <DebugType />
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <JitOptimizationSensitive Condition="'$(Platform)' == 'arm64'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(BuildArch)' == 'arm64'">true</JitOptimizationSensitive>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VectorMgdMgd.cs" />
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
index ab3b417..1f52caf 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DisableProjectBuild Condition="'$(Platform)' == 'x64'">true</DisableProjectBuild>
-    <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'x64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
index 5f87f87..758a3e4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+    <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
index 4d335ba..becd835 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+    <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj
index 2fd748f..b214151 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+    <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86'">true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
index c6f2f71..d5df312 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
@@ -8,11 +8,11 @@
     <Optimize>True</Optimize>
   </PropertyGroup>
   <PropertyGroup>
-    <PointerSize Condition="'$(Platform)'=='x64'">64</PointerSize>
-    <PointerSize Condition="'$(Platform)'=='arm64'">64</PointerSize>
-    <PointerSize Condition="'$(Platform)'=='x86'">32</PointerSize>
-    <PointerSize Condition="'$(Platform)'=='arm'">32</PointerSize>
-    <PointerSize Condition="'$(Platform)'=='armel'">32</PointerSize>
+    <PointerSize Condition="'$(BuildArch)'=='x64'">64</PointerSize>
+    <PointerSize Condition="'$(BuildArch)'=='arm64'">64</PointerSize>
+    <PointerSize Condition="'$(BuildArch)'=='x86'">32</PointerSize>
+    <PointerSize Condition="'$(BuildArch)'=='arm'">32</PointerSize>
+    <PointerSize Condition="'$(BuildArch)'=='armel'">32</PointerSize>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PointerSize)' == '64' ">
     <Compile Include="DevDiv_278523_64.il" />
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
index c1a989f..3716edd 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under GC stress; it is not fundamentally incompatible -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+    <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
index 7c2ebaf..49c7772 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+    <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86'">true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
index 3ee4e79..2714565 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+    <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
+    <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86'">true</HeapVerifyIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
index 542bac8..5fa5854 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
@@ -9,7 +9,7 @@
     <Optimize>True</Optimize>
     <!-- This test is very resource heavy and doesn't play well with some JitStress modes, especially when memory is limited  (x86),
          on arm the test fails to crossgen with stress mode because of an relocation offset size limit, see #16587 -->
-    <JitOptimizationSensitive Condition="'$(Platform)' == 'x86' Or '$(Platform)' == 'arm'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(BuildArch)' == 'x86' Or '$(BuildArch)' == 'arm'">true</JitOptimizationSensitive>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hugeexpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
index 4839b99..89af0a2 100644
--- a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
+++ b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
@@ -5,7 +5,7 @@
     <!-- This test takes a long time to complete -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <!-- https://github.com/dotnet/coreclr/issues/24633 -->
-    <JitOptimizationSensitive Condition="'$(Platform)' == 'arm'">true</JitOptimizationSensitive>
+    <JitOptimizationSensitive Condition="'$(BuildArch)' == 'arm'">true</JitOptimizationSensitive>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj b/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj
index 3133e13..df39adf 100644
--- a/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj
+++ b/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj
@@ -4,7 +4,7 @@
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
     <!-- Crossgen2 currently targets only x64 -->
-    <DisableProjectBuild Condition="'$(Platform)' != 'x64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' != 'x64'">true</DisableProjectBuild>
     <!-- Known not to work with GCStress for now: https://github.com/dotnet/coreclr/issues/26633 -->
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This is an explicit crossgen test -->
diff --git a/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj b/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj
index 962adf7..0116d11 100644
--- a/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj
+++ b/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj
@@ -6,7 +6,7 @@
     <CLRTestPriority>0</CLRTestPriority>
 
     <!-- Crossgen2 currently targets only x64 -->
-    <DisableProjectBuild Condition="'$(Platform)' != 'x64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' != 'x64'">true</DisableProjectBuild>
 
     <!-- Generate ILDLL so that the DLL can be the crossgenned assembly -->
     <TargetExt>.ildll</TargetExt>
diff --git a/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj b/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj
index 5786047..c5c2f35 100644
--- a/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj
+++ b/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj
@@ -4,7 +4,7 @@
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
     <!-- Crossgen2 currently targets only x64 -->
-    <DisableProjectBuild Condition="'$(Platform)' != 'x64'">true</DisableProjectBuild>
+    <DisableProjectBuild Condition="'$(BuildArch)' != 'x64'">true</DisableProjectBuild>
     <!-- Known not to work with GCStress for now: https://github.com/dotnet/coreclr/issues/26633 -->
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- This is an explicit crossgen test -->
diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj
index 97007a0..ca9f7b2 100644
--- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj
+++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj
@@ -12,7 +12,7 @@
     <!-- Test unsupported outside of windows -->
     <!-- Test unsupported on arm targets -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
-    <DisableProjectBuild Condition=" '$(Platform)' == 'arm64' or '$(Platform)' == 'arm' or '$(TargetsUnix)' == 'true' ">true</DisableProjectBuild>
+    <DisableProjectBuild Condition=" '$(BuildArch)' == 'arm64' or '$(BuildArch)' == 'arm' or '$(TargetsUnix)' == 'true' ">true</DisableProjectBuild>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Fails with JIT stress modes, issue #19415 -->
-- 
2.7.4