From d41fe965675b633a601d1e54b525718899265416 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Mon, 6 Apr 2020 22:40:53 -0400
Subject: [PATCH 01/10] Add missing TraitTags

---
 .../tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj   | 3 +++
 .../tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj   | 3 +++
 .../tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj   | 3 +++
 .../tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj    | 3 +++
 src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj  | 3 +++
 .../JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj | 3 +++
 .../src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj    | 3 +++
 .../JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj | 3 +++
 .../JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj | 3 +++
 .../src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj    | 3 +++
 .../JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj | 3 +++
 .../tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj     | 3 +++
 .../tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj     | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj     | 3 +++
 .../JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj  | 3 +++
 17 files changed, 51 insertions(+)

diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
index 9b4a0487eddfe..f06696a325293 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
@@ -14,4 +14,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="ArchSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
index 9b4a0487eddfe..f06696a325293 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
@@ -14,4 +14,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="ArchSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
index 9b4a0487eddfe..f06696a325293 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
@@ -14,4 +14,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="ArchSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
index 9b4a0487eddfe..f06696a325293 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
@@ -14,4 +14,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="ArchSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj
index cf56275343e57..09dc33b6eb8fe 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj
@@ -7,6 +7,9 @@
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
+  <ItemGroup>
+    <TraitTags Include="OsSpecific" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="StructABI.cs" />
     <Compile Include="StructABI.Windows.cs" Condition="'$(TargetOS)' == 'Windows_NT'" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
index 478982eb0052e..ddcb22579b6cf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
@@ -13,4 +13,7 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="i_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="i_array_merge-i386.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
index 0659873925cbd..f6447cd6e0892 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
@@ -13,4 +13,7 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="sizeof-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="sizeof-i386.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
index c5ca10a9a6510..2f6488f88e223 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
@@ -13,4 +13,7 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="u_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="u_array_merge-i386.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
index c5e2a6e9bd16d..05579d77a48ef 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
@@ -13,4 +13,7 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="i_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="i_array_merge-i386.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
index 3e8d48b9b73a6..74cc1f6d33954 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
@@ -13,4 +13,7 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="sizeof-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="sizeof-i386.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
index f4667a3506a4d..549da42e981ac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
@@ -13,4 +13,7 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="u_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="u_array_merge-i386.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
index dc96da1d252a7..8ae9d215a229a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
@@ -11,4 +11,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
index 31e939d4fd0e0..37371384fd1db 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
@@ -11,4 +11,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof32.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof32.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
index 11a4aaf470f9f..287cd49c3e5f1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
@@ -11,4 +11,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
index 009bf41e26d2d..04e1ee7cce6a4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
@@ -11,4 +11,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof32.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof32.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
index e23cce8f45e4b..1dd39ecabc8cc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
@@ -11,4 +11,7 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof64.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof64.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>
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 405a3177dd7b9..4fa1f430d6674 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
@@ -20,4 +20,7 @@
   <ItemGroup Condition=" '$(PointerSize)' == '32' ">
     <Compile Include="DevDiv_278523_32.il" />
   </ItemGroup>
+  <ItemGroup>
+    <TraitTags Include="BitSpecific" />
+  </ItemGroup>
 </Project>

From 1c35c2393470a17d705174e68308c6d9d6ea9aeb Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Mon, 6 Apr 2020 13:40:13 -0400
Subject: [PATCH 02/10] Add redundant metadata to simplify filtering

Instead of generic filtering add a manual property
---
 .../src/Common/test_dependencies/test_dependencies.csproj     | 4 ++++
 .../ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj  | 3 +++
 .../src/Interop/COM/NativeClients/DefaultInterfaces.csproj    | 3 +++
 .../tests/src/Interop/COM/NativeClients/Dispatch.csproj       | 3 +++
 .../tests/src/Interop/COM/NativeClients/Licensing.csproj      | 3 +++
 .../tests/src/Interop/COM/NativeClients/Primitives.csproj     | 3 +++
 .../DllImportAttribute/DllImportPath/DllImportPathTest.csproj | 3 +++
 .../DllImportAttribute/ExactSpelling/ExactSpellingTest.csproj | 3 +++
 .../ICustomMarshaler/Primitives/ICustomMarshaler.csproj       | 3 +++
 .../Interop/NativeLibrary/Callback/CallbackStressTest.csproj  | 3 +++
 .../tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj  | 3 +++
 .../tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj  | 3 +++
 .../tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj  | 3 +++
 .../tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj   | 3 +++
 src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj | 3 +++
 src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj      | 3 +++
 .../Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj    | 3 +++
 .../src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj   | 3 +++
 .../Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj    | 3 +++
 .../Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj    | 3 +++
 .../src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj   | 3 +++
 .../Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj    | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj      | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj    | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj      | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj    | 3 +++
 .../src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj    | 3 +++
 .../JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj | 3 +++
 .../JIT/Regression/JitBlue/GitHub_23199/GitHub_23199.csproj   | 3 +++
 src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj         | 3 +++
 src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj        | 3 +++
 .../exceptions/WindowsEventLog/WindowsEventLog.csproj         | 3 +++
 32 files changed, 97 insertions(+)

diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
index 19d473b6d6bfe..124c872d4ac1b 100644
--- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -28,6 +28,10 @@
     </ItemGroup>
   </Target>
 
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
+
   <Target Name="AddLibrariesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" DependsOnTargets="ResolveLibrariesFromLocalBuild">
     <ItemGroup>
       <RuntimeCopyLocalItems Include="@(LibrariesRuntimeFiles)" />
diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
index 12afda608fcb7..79b1c0aaa5acd 100644
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
@@ -9,6 +9,9 @@
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj
index 6cb6721c6f8c8..75cd4e855269e 100644
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj
@@ -16,6 +16,9 @@
     <ProjectReference Include="../NetServer/NetServer.DefaultInterfaces.ilproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj
index b33ab1d368846..1c758d92634fb 100644
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj
@@ -16,6 +16,9 @@
     <ProjectReference Include="../NetServer/NetServer.csproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj
index 0fe6b395d0939..4b94fda93daa9 100644
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj
@@ -16,6 +16,9 @@
     <ProjectReference Include="../NetServer/NetServer.csproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj
index 13dd6c59fcd0d..0419036b66cfb 100644
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj
@@ -16,6 +16,9 @@
     <ProjectReference Include="../NetServer/NetServer.csproj" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj b/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
index 710b722257a32..15f9293c9e41c 100644
--- a/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
+++ b/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
@@ -19,6 +19,9 @@
   <ItemGroup>
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/DllImportAttribute/ExactSpelling/ExactSpellingTest.csproj b/src/coreclr/tests/src/Interop/DllImportAttribute/ExactSpelling/ExactSpellingTest.csproj
index c04abb85255b8..f7c511d31119a 100644
--- a/src/coreclr/tests/src/Interop/DllImportAttribute/ExactSpelling/ExactSpellingTest.csproj
+++ b/src/coreclr/tests/src/Interop/DllImportAttribute/ExactSpelling/ExactSpellingTest.csproj
@@ -9,6 +9,9 @@
     <ProjectReference Include="CMakeLists.txt" />
     <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/ICustomMarshaler/Primitives/ICustomMarshaler.csproj b/src/coreclr/tests/src/Interop/ICustomMarshaler/Primitives/ICustomMarshaler.csproj
index 4d561ff8ff0e0..9e95f3b1c11ca 100644
--- a/src/coreclr/tests/src/Interop/ICustomMarshaler/Primitives/ICustomMarshaler.csproj
+++ b/src/coreclr/tests/src/Interop/ICustomMarshaler/Primitives/ICustomMarshaler.csproj
@@ -10,6 +10,9 @@
     <Compile Include="ICustomMarshaler.cs" />
     <Compile Include="..\..\common\XunitBase.cs" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/NativeLibrary/Callback/CallbackStressTest.csproj b/src/coreclr/tests/src/Interop/NativeLibrary/Callback/CallbackStressTest.csproj
index 16d0808818a4d..37f521f5d03e4 100644
--- a/src/coreclr/tests/src/Interop/NativeLibrary/Callback/CallbackStressTest.csproj
+++ b/src/coreclr/tests/src/Interop/NativeLibrary/Callback/CallbackStressTest.csproj
@@ -11,6 +11,9 @@
   <ItemGroup>
     <ProjectReference Include="../NativeLibraryToLoad/CMakeLists.txt" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
index f06696a325293..8537d83854a71 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
@@ -14,6 +14,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="ArchSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
index f06696a325293..8537d83854a71 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
@@ -14,6 +14,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="ArchSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
index f06696a325293..8537d83854a71 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
@@ -14,6 +14,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="ArchSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
index f06696a325293..8537d83854a71 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
@@ -14,6 +14,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'arm64'" Include="arglist64.il" />
     <Compile Condition="'$(TargetArchitecture)' == 'armel'" Include="arglistARM.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="ArchSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj
index 09dc33b6eb8fe..d43bf082a225b 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj
@@ -7,6 +7,9 @@
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj b/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj
index c6dbd68272d9f..7068aa49ee810 100644
--- a/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj
@@ -17,6 +17,9 @@
   <ItemGroup>
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
index ddcb22579b6cf..bd7959e0773e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
@@ -13,6 +13,9 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="i_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="i_array_merge-i386.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
index f6447cd6e0892..0aa2ae56cc6dc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
@@ -13,6 +13,9 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="sizeof-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="sizeof-i386.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
index 2f6488f88e223..0d4ec042d7025 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
@@ -13,6 +13,9 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="u_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="u_array_merge-i386.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
index 05579d77a48ef..668ee76bb9ae2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
@@ -13,6 +13,9 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="i_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="i_array_merge-i386.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
index 74cc1f6d33954..66c4e233b6989 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
@@ -13,6 +13,9 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="sizeof-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="sizeof-i386.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
index 549da42e981ac..e0aebf01ab07d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
@@ -13,6 +13,9 @@
     <Compile Condition="'$(TargetArchitecture)' ==   'arm'" Include="u_array_merge-i386.il" />
     <Compile Condition="'$(TargetArchitecture)' ==   'armel'" Include="u_array_merge-i386.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
index 8ae9d215a229a..8ab98983125e5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
@@ -11,6 +11,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
index 37371384fd1db..e018c7d5ff5e7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
@@ -11,6 +11,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof32.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof32.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
index 287cd49c3e5f1..ec29e45a3c4d1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
@@ -11,6 +11,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
index 04e1ee7cce6a4..5b71d7e1ea72d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
@@ -11,6 +11,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof32.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof32.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
index 1dd39ecabc8cc..0323f6a84278a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
@@ -11,6 +11,9 @@
     <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof64.il" />
     <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof64.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
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 4fa1f430d6674..c5def63c070af 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
@@ -20,6 +20,9 @@
   <ItemGroup Condition=" '$(PointerSize)' == '32' ">
     <Compile Include="DevDiv_278523_32.il" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_23199/GitHub_23199.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_23199/GitHub_23199.csproj
index 646ca2fcb74c9..6bd75d815d0cd 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_23199/GitHub_23199.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_23199/GitHub_23199.csproj
@@ -23,6 +23,9 @@ export COMPlus_GcStressOnDirectCalls=1
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj
index 6d2c482d19144..b74db7cdcd5db 100644
--- a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj
+++ b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj
@@ -13,6 +13,9 @@
     <Compile Include="VectorConvert.cs" />
     <Compile Include="VectorUtil.cs" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj
index 5fe92ee4e08cc..f3ae2a5cee844 100644
--- a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj
+++ b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj
@@ -13,6 +13,9 @@
     <Compile Include="VectorConvert.cs" />
     <Compile Include="VectorUtil.cs" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="BitSpecific" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj b/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
index aa33e315d24d6..2044e1619f647 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
@@ -10,6 +10,9 @@
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
+  <PropertyGroup>
+    <CLRTestNeedTarget>1</CLRTestNeedTarget>
+  </PropertyGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />
   </ItemGroup>

From 4de89bc8be06e275987b03d04e39a9cdf1805575 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Mon, 6 Apr 2020 13:46:39 -0400
Subject: [PATCH 03/10] Filter test build using CLRTestNeedTargetToBuild

---
 src/coreclr/tests/Directory.Build.props       | 9 +++++++++
 src/coreclr/tests/src/Directory.Build.targets | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props
index d2a5b807c5f72..e8288aea84c16 100644
--- a/src/coreclr/tests/Directory.Build.props
+++ b/src/coreclr/tests/Directory.Build.props
@@ -57,6 +57,15 @@
     <CLRTestPriorityToBuild>0</CLRTestPriorityToBuild>
   </PropertyGroup>
 
+  <!-- Which tests can we build? Default: All tests.
+    At the command-line, the user can specify:
+    +  /p:CLRTestNeedTargetToBuild=0 and tests which do not "need a target specified" will build.
+    +  /p:CLRTestNeedTargetToBuild=1 and tests which do "need a target specified" will build.
+   -->
+  <PropertyGroup>
+    <CLRTestNeedTargetToBuild></CLRTestNeedTargetToBuild>
+  </PropertyGroup>
+
   <!-- Where to put a "testhost" for running corefx tests -->
   <PropertyGroup>
     <TestHostVersion>$(ProductVersion)</TestHostVersion>
diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets
index f99c73df8825c..2372c053fffce 100644
--- a/src/coreclr/tests/src/Directory.Build.targets
+++ b/src/coreclr/tests/src/Directory.Build.targets
@@ -4,6 +4,7 @@
     <CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Library'">SharedLibrary</CLRTestKind>
     <CLRTestKind Condition="'$(CLRTestKind)' == ''">BuildAndRun</CLRTestKind>
     <CLRTestPriority Condition="'$(CLRTestPriority)' == ''">0</CLRTestPriority>
+    <CLRTestNeedTarget Condition="'$(CLRTestNeedTarget)' == ''">0</CLRTestNeedTarget>
   </PropertyGroup>
 
   <!-- All CLRTests need to be of a certain "kind". These kinds are enumerated below.
@@ -72,6 +73,7 @@
     <_WillCLRTestProjectBuild Condition="'$(_WillCLRTestProjectBuild)' == ''">false</_WillCLRTestProjectBuild>
     <_WillCLRTestProjectBuild Condition="'$(BuildAllProjects)' != 'true'">true</_WillCLRTestProjectBuild>
     <_WillCLRTestProjectBuild Condition="'$(BuildAllProjects)' == 'true' And '$(CLRTestPriority)' &lt;= '$(CLRTestPriorityToBuild)'">true</_WillCLRTestProjectBuild>
+    <_WillCLRTestProjectBuild Condition="'$(CLRTestNeedTargetToBuild)' != '' And '$(CLRTestNeedTarget)' != '$(CLRTestNeedTargetToBuild)'">false</_WillCLRTestProjectBuild>
     <_WillCLRTestProjectBuild Condition="'$(DisableProjectBuild)' == 'true'">false</_WillCLRTestProjectBuild>
   </PropertyGroup>
 
@@ -102,6 +104,7 @@
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage>
 
     <SkipImportILTargets Condition="'$(CLRTestPriority)' &gt; '$(CLRTestPriorityToBuild)'">true</SkipImportILTargets>
+    <SkipImportILTargets Condition="'$(CLRTestNeedTargetToBuild)' != '' And '$(CLRTestNeedTarget)' != '$(CLRTestNeedTargetToBuild)'">true</SkipImportILTargets>
   </PropertyGroup>
 
   <Import Project="CLRTest.Execute.targets" />

From 7c5484fe9eee281c9dbe268614dce8f31f42f8d3 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Mon, 6 Apr 2020 13:53:04 -0400
Subject: [PATCH 04/10] Add -needTarget[01] to build-test.sh

---
 src/coreclr/build-test.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index 24b7d3275b071..9c4a1fbbfcc81 100755
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -494,6 +494,9 @@ usage_list+=("-crossgen2: Precompiles the framework managed assemblies in corero
 usage_list+=("-generatetesthostonly: only generate the test host.")
 usage_list+=("-generatelayoutonly: only pull down dependencies and build coreroot.")
 usage_list+=("-priority1: include priority=1 tests in the build.")
+usage_list+=("-needTarget0: to only build tests which run on any platform in the build.")
+usage_list+=("-needTarget1: to only build tests which run on a specific platform  in the build.")
+
 usage_list+=("-rebuild: if tests have already been built - rebuild them.")
 usage_list+=("-runtests: run tests after building them.")
 usage_list+=("-skiprestorepackages: skip package restore.")
@@ -503,6 +506,7 @@ usage_list+=("-excludemonofailures: Mark the build as running on Mono runtime so
 # Obtain the location of the bash script to figure out where the root of the repo is.
 __ProjectRoot="$(cd "$(dirname "$0")"; pwd -P)"
 __RepoRootDir="$(cd "$__ProjectRoot"/../..; pwd -P)"
+__BuildArch=
 
 handle_arguments_local() {
     case "$1" in
@@ -545,6 +549,16 @@ handle_arguments_local() {
             __UnprocessedBuildArgs+=("/p:CLRTestPriorityToBuild=1")
             ;;
 
+        needTarget0|-needTarget0)
+            __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=0")
+            __BuildArch=AnyCPU
+            __TargetOS=AnyOS
+            ;;
+
+        needTarget1|-needTarget1)
+            __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=1")
+            ;;
+
         rebuild|-rebuild)
             __RebuildTests=1
             ;;
@@ -570,7 +584,6 @@ handle_arguments_local() {
     esac
 }
 
-__BuildArch=
 __BuildType=Debug
 __CodeCoverage=
 __IncludeTests=INCLUDE_TESTS

From 3b0e3eb2dd517a5a03fab33f0792dd986e486dab Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Mon, 6 Apr 2020 16:17:30 -0400
Subject: [PATCH 05/10] Add -needTarget to build-test.cmd

---
 src/coreclr/build-test.cmd | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index 2dbb3b134ddaa..c0a76047f533e 100644
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -73,6 +73,9 @@ set __GenerateLayoutOnly=0
 set __Priority=0
 set __PriorityArg=
 
+set __BuildNeedTarget=2
+set __BuildNeedTargetArg=
+
 :Arg_Loop
 if "%1" == "" goto ArgsDone
 
@@ -108,6 +111,7 @@ if /i "%1" == "runtimeid"             (set __RuntimeId=%2&set processedArgs=!pro
 if /i "%1" == "targetsNonWindows"     (set __TargetsWindows=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "Exclude"               (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
 if /i "%1" == "-priority"             (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
+if /i "%1" == "-needTarget"           (set __BuildNeedTarget=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
 if /i "%1" == "copynativeonly"        (set __CopyNativeTestBinaries=1&set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set __SkipCrossgenFramework=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skipgeneratelayout"    (set __SkipGenerateLayout=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "generatelayoutonly"    (set __SkipManaged=1&set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
@@ -129,6 +133,14 @@ if %__Priority% GTR 0 (
     set "__PriorityArg=/p:CLRTestPriorityToBuild=%__Priority%"
 )
 
+if %__BuildNeedTarget% NEQ 2 (
+    set "__BuildNeedTargetArg=/p:CLRTestNeedTargetToBuild=%__BuildNeedTarget%"
+    if %__BuildNeedTarget% EQU 0 (
+        set __TargetOS=AnyOS
+        set __BuildArch=AnyCPU
+    )
+)
+
 set TargetsWindowsArg=
 set TargetsWindowsMsbuildArg=
 if "%__TargetsWindows%"=="1" (
@@ -300,7 +312,7 @@ powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -Command "%__RepoRootDir%\
   /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^
   /p:UsePartialNGENOptimization=false /maxcpucount^
   %__SkipFXRestoreArg%^
-  !__Logging! %__CommonMSBuildArgs% %__PriorityArg% %__UnprocessedBuildArgs%
+  !__Logging! %__CommonMSBuildArgs% %__PriorityArg% %__BuildNeedTargetArg% %__UnprocessedBuildArgs%
 
 if errorlevel 1 (
     echo %__ErrMsgPrefix%%__MsgPrefix%Error: Package restoration failed. Refer to the build log files for details:
@@ -360,7 +372,7 @@ for /l %%G in (1, 1, %__NumberOfTestGroups%) do (
         set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__Logging!
         set __MSBuildBuildArgs=!__MSBuildBuildArgs! !TargetsWindowsMsbuildArg!
         set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__msbuildArgs!
-        set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__PriorityArg!
+        set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__PriorityArg! !__BuildNeedTargetArg!
         set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__UnprocessedBuildArgs!
         set __MSBuildBuildArgs=!__MSBuildBuildArgs! /p:CopyNativeProjectBinaries=!__CopyNativeProjectsAfterCombinedTestBuild!
         set __MSBuildBuildArgs=!__MSBuildBuildArgs! /p:__SkipPackageRestore=true
@@ -379,7 +391,7 @@ for /l %%G in (1, 1, %__NumberOfTestGroups%) do (
             goto     :Exit_Failure
         )
     ) else (
-        set __MSBuildBuildArgs=!__ProjectDir!\tests\build.proj -warnAsError:0 /nodeReuse:false !__Logging! !TargetsWindowsMsbuildArg! !__msbuildArgs!  !__PriorityArg! !__SkipFXRestoreArg! !__UnprocessedBuildArgs! "/t:CopyAllNativeProjectReferenceBinaries"
+        set __MSBuildBuildArgs=!__ProjectDir!\tests\build.proj -warnAsError:0 /nodeReuse:false !__Logging! !TargetsWindowsMsbuildArg! !__msbuildArgs!  !__PriorityArg! !__BuildNeedTargetArg! !__SkipFXRestoreArg! !__UnprocessedBuildArgs! "/t:CopyAllNativeProjectReferenceBinaries"
         echo Running: msbuild !__MSBuildBuildArgs!
         !__CommonMSBuildCmdPrefix! !__MSBuildBuildArgs!
 
@@ -464,7 +476,7 @@ powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng
   /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^
   /p:UsePartialNGENOptimization=false /maxcpucount^
   %__SkipFXRestoreArg%^
-  !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__UnprocessedBuildArgs%
+  !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__BuildNeedTargetArg% %__UnprocessedBuildArgs%
 if errorlevel 1 (
     echo %__ErrMsgPrefix%%__MsgPrefix%Error: Create Test Overlay failed. Refer to the build log files for details:
     echo     %__BuildLog%
@@ -606,6 +618,7 @@ echo -priority=^<N^> : specify a set of tests that will be built and run, with p
 echo     0: Build only priority 0 cases as essential testcases (default)
 echo     1: Build all tests with priority 0 and 1
 echo     666: Build all tests with priority 0, 1 ... 666
+echo -needTarget=^<0^|1^> : only build tests which do=1 or do not require a specific target
 echo -verbose: enables detailed file logging for the msbuild tasks into the msbuild log file.
 exit /b 1
 

From 5caf4571e7667b13d1b80870795e06414455e6c0 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Tue, 7 Apr 2020 14:40:28 -0400
Subject: [PATCH 06/10] Add distroRid=any

---
 eng/native/init-distro-rid.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index fdb332afc6e42..9cb08d92c8fb3 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -165,6 +165,10 @@ initDistroRidGlobal()
                 distroRid="android-$buildArch"
             elif [ "$targetOs" = "FreeBSD" ]; then
                 distroRid="freebsd-$buildArch"
+            elif [ "$targetOs" = "AnyOS" ]; then
+                if [ "$buildArch" = "AnyCPU" ]; then
+                    distroRid="any"
+                fi
             fi
         fi
 

From e512e7f27d35325af2ecbd180415e293d61fda50 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Tue, 7 Apr 2020 14:41:44 -0400
Subject: [PATCH 07/10] Allow BuildTargetingPack TargetOS==AnyOS

---
 src/coreclr/tests/build.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj
index f09deee581fd8..fa0b93582eca9 100644
--- a/src/coreclr/tests/build.proj
+++ b/src/coreclr/tests/build.proj
@@ -27,7 +27,6 @@
 
   <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages" Condition="$(__SkipTargetingPackBuild) != 'true'">
     <Message Text="Building Targeting Pack" Importance="High" />
-    <Error  Text="TargetOS has not been specified. Please do that then run build again."  Condition="'$(TargetOS)' == 'AnyOS'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)external\external.csproj"
              Targets="Build" />
   </Target>

From 37cabbf6b9e2385e6a89aeaba492f40c620d165c Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Tue, 7 Apr 2020 16:35:20 -0400
Subject: [PATCH 08/10] Don't use AnyOS-AnyCPU for generic test builds

---
 eng/native/init-distro-rid.sh | 4 ----
 src/coreclr/build-test.cmd    | 4 ----
 src/coreclr/build-test.sh     | 2 --
 src/coreclr/tests/build.proj  | 1 +
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index 9cb08d92c8fb3..fdb332afc6e42 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -165,10 +165,6 @@ initDistroRidGlobal()
                 distroRid="android-$buildArch"
             elif [ "$targetOs" = "FreeBSD" ]; then
                 distroRid="freebsd-$buildArch"
-            elif [ "$targetOs" = "AnyOS" ]; then
-                if [ "$buildArch" = "AnyCPU" ]; then
-                    distroRid="any"
-                fi
             fi
         fi
 
diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index c0a76047f533e..73681963657a8 100644
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -135,10 +135,6 @@ if %__Priority% GTR 0 (
 
 if %__BuildNeedTarget% NEQ 2 (
     set "__BuildNeedTargetArg=/p:CLRTestNeedTargetToBuild=%__BuildNeedTarget%"
-    if %__BuildNeedTarget% EQU 0 (
-        set __TargetOS=AnyOS
-        set __BuildArch=AnyCPU
-    )
 )
 
 set TargetsWindowsArg=
diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index 9c4a1fbbfcc81..a01442b00b4f2 100755
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -551,8 +551,6 @@ handle_arguments_local() {
 
         needTarget0|-needTarget0)
             __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=0")
-            __BuildArch=AnyCPU
-            __TargetOS=AnyOS
             ;;
 
         needTarget1|-needTarget1)
diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj
index fa0b93582eca9..f09deee581fd8 100644
--- a/src/coreclr/tests/build.proj
+++ b/src/coreclr/tests/build.proj
@@ -27,6 +27,7 @@
 
   <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages" Condition="$(__SkipTargetingPackBuild) != 'true'">
     <Message Text="Building Targeting Pack" Importance="High" />
+    <Error  Text="TargetOS has not been specified. Please do that then run build again."  Condition="'$(TargetOS)' == 'AnyOS'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)external\external.csproj"
              Targets="Build" />
   </Target>

From 32c5949892dc8fa351dce0fa36556b2d4c150d1d Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Tue, 7 Apr 2020 17:05:26 -0400
Subject: [PATCH 09/10] Update CheckTestBuild expected counts

---
 src/coreclr/tests/src/runtest.proj | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj
index fec812140caec..ab16b2cda967e 100644
--- a/src/coreclr/tests/src/runtest.proj
+++ b/src/coreclr/tests/src/runtest.proj
@@ -65,10 +65,15 @@
 
     <Message Text="Found $(TestCount) built tests"/>
 
-    <Error Condition="'$(CLRTestPriorityToBuild)' == '0' and '$(TestCount)' &lt;= 2000" Text="Unexpected test count. Expected &gt; 2000, found $(TestCount).'" />
-    <Error Condition="'$(CLRTestPriorityToBuild)' == '0' and '$(TestCount)' &gt;= 3000" Text="Unexpected test count. Expected &lt; 3000, found $(TestCount).'" />
-    <Error Condition="'$(CLRTestPriorityToBuild)' == '1' and '$(TestCount)' &lt;= 9000" Text="Unexpected test count. Expected &gt; 9000, found $(TestCount).'" />
-    <Error Condition="'$(CLRTestPriorityToBuild)' != '0' and '$(CLRTestPriorityToBuild)' != '1'" Text="Unknown priority $(CLRTestPriorityToBuild)" />
+    <ItemGroup Condition="$(CLRTestNeedTargetToBuild) != 1">
+      <Error Condition="'$(CLRTestPriorityToBuild)' == '0' and '$(TestCount)' &lt;= 2000" Text="Unexpected test count. Expected &gt; 2000, found $(TestCount).'" />
+      <Error Condition="'$(CLRTestPriorityToBuild)' == '0' and '$(TestCount)' &gt;= 3000" Text="Unexpected test count. Expected &lt; 3000, found $(TestCount).'" />
+      <Error Condition="'$(CLRTestPriorityToBuild)' == '1' and '$(TestCount)' &lt;= 9000" Text="Unexpected test count. Expected &gt; 9000, found $(TestCount).'" />
+      <Error Condition="'$(CLRTestPriorityToBuild)' != '0' and '$(CLRTestPriorityToBuild)' != '1'" Text="Unknown priority $(CLRTestPriorityToBuild)" />
+    </ItemGroup>
+    <ItemGroup Condition="$(CLRTestNeedTargetToBuild) == 1">
+      <Error Condition="'$(TestCount)' &lt;= 100" Text="Unexpected test count. Expected &lt; 100, found $(TestCount).'" />
+    </ItemGroup>
   </Target>
 
   <Import Project="$(__Exclude)" Condition="'$(__Exclude)' != '' AND '$(XunitTestBinBase)' != ''" />

From b62eace0de6b23e8cc0363cf3540f3ebbe5b165f Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Wed, 8 Apr 2020 12:28:49 -0400
Subject: [PATCH 10/10] Rename per feedback

---
 src/coreclr/build-test.cmd                    | 11 ++++-------
 src/coreclr/build-test.sh                     | 12 ++++++------
 src/coreclr/tests/Directory.Build.props       |  4 ++--
 src/coreclr/tests/src/Directory.Build.targets |  3 ++-
 src/coreclr/tests/src/runtest.proj            |  6 ++++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index 73681963657a8..6ae3904d022f1 100644
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -73,7 +73,6 @@ set __GenerateLayoutOnly=0
 set __Priority=0
 set __PriorityArg=
 
-set __BuildNeedTarget=2
 set __BuildNeedTargetArg=
 
 :Arg_Loop
@@ -111,7 +110,8 @@ if /i "%1" == "runtimeid"             (set __RuntimeId=%2&set processedArgs=!pro
 if /i "%1" == "targetsNonWindows"     (set __TargetsWindows=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "Exclude"               (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
 if /i "%1" == "-priority"             (set __Priority=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
-if /i "%1" == "-needTarget"           (set __BuildNeedTarget=%2&shift&set processedArgs=!processedArgs! %1=%2&shift&goto Arg_Loop)
+if /i "%1" == "targetGeneric"         (set "__BuildNeedTargetArg=/p:CLRTestNeedTargetToBuild=%1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "targetSpecific"        (set "__BuildNeedTargetArg=/p:CLRTestNeedTargetToBuild=%1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "copynativeonly"        (set __CopyNativeTestBinaries=1&set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set __SkipCrossgenFramework=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skipgeneratelayout"    (set __SkipGenerateLayout=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "generatelayoutonly"    (set __SkipManaged=1&set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
@@ -133,10 +133,6 @@ if %__Priority% GTR 0 (
     set "__PriorityArg=/p:CLRTestPriorityToBuild=%__Priority%"
 )
 
-if %__BuildNeedTarget% NEQ 2 (
-    set "__BuildNeedTargetArg=/p:CLRTestNeedTargetToBuild=%__BuildNeedTarget%"
-)
-
 set TargetsWindowsArg=
 set TargetsWindowsMsbuildArg=
 if "%__TargetsWindows%"=="1" (
@@ -614,7 +610,8 @@ echo -priority=^<N^> : specify a set of tests that will be built and run, with p
 echo     0: Build only priority 0 cases as essential testcases (default)
 echo     1: Build all tests with priority 0 and 1
 echo     666: Build all tests with priority 0, 1 ... 666
-echo -needTarget=^<0^|1^> : only build tests which do=1 or do not require a specific target
+echo targetGeneric: Only build tests which run on any target platform.
+echo targetSpecific: Only build tests which run on a specific target platform.
 echo -verbose: enables detailed file logging for the msbuild tasks into the msbuild log file.
 exit /b 1
 
diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index a01442b00b4f2..65110b5ef3b21 100755
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -494,8 +494,8 @@ usage_list+=("-crossgen2: Precompiles the framework managed assemblies in corero
 usage_list+=("-generatetesthostonly: only generate the test host.")
 usage_list+=("-generatelayoutonly: only pull down dependencies and build coreroot.")
 usage_list+=("-priority1: include priority=1 tests in the build.")
-usage_list+=("-needTarget0: to only build tests which run on any platform in the build.")
-usage_list+=("-needTarget1: to only build tests which run on a specific platform  in the build.")
+usage_list+=("-targetGeneric: Only build tests which run on any target platform.")
+usage_list+=("-targetSpecific: Only build tests which run on a specific target platform.")
 
 usage_list+=("-rebuild: if tests have already been built - rebuild them.")
 usage_list+=("-runtests: run tests after building them.")
@@ -549,12 +549,12 @@ handle_arguments_local() {
             __UnprocessedBuildArgs+=("/p:CLRTestPriorityToBuild=1")
             ;;
 
-        needTarget0|-needTarget0)
-            __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=0")
+        targetGeneric|-targetGeneric)
+            __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=targetGeneric")
             ;;
 
-        needTarget1|-needTarget1)
-            __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=1")
+        targetSpecific|-targetSpecific)
+            __UnprocessedBuildArgs+=("/p:CLRTestNeedTargetToBuild=targetSpecific")
             ;;
 
         rebuild|-rebuild)
diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props
index e8288aea84c16..db10db5197b7c 100644
--- a/src/coreclr/tests/Directory.Build.props
+++ b/src/coreclr/tests/Directory.Build.props
@@ -59,8 +59,8 @@
 
   <!-- Which tests can we build? Default: All tests.
     At the command-line, the user can specify:
-    +  /p:CLRTestNeedTargetToBuild=0 and tests which do not "need a target specified" will build.
-    +  /p:CLRTestNeedTargetToBuild=1 and tests which do "need a target specified" will build.
+    +  /p:CLRTestNeedTargetToBuild=targetGeneric    Only build tests which run on any target platform.
+    +  /p:CLRTestNeedTargetToBuild=targetSpecific   Only build tests which run on a specific target platform.
    -->
   <PropertyGroup>
     <CLRTestNeedTargetToBuild></CLRTestNeedTargetToBuild>
diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets
index 2372c053fffce..d51b15ad5b1ec 100644
--- a/src/coreclr/tests/src/Directory.Build.targets
+++ b/src/coreclr/tests/src/Directory.Build.targets
@@ -73,7 +73,8 @@
     <_WillCLRTestProjectBuild Condition="'$(_WillCLRTestProjectBuild)' == ''">false</_WillCLRTestProjectBuild>
     <_WillCLRTestProjectBuild Condition="'$(BuildAllProjects)' != 'true'">true</_WillCLRTestProjectBuild>
     <_WillCLRTestProjectBuild Condition="'$(BuildAllProjects)' == 'true' And '$(CLRTestPriority)' &lt;= '$(CLRTestPriorityToBuild)'">true</_WillCLRTestProjectBuild>
-    <_WillCLRTestProjectBuild Condition="'$(CLRTestNeedTargetToBuild)' != '' And '$(CLRTestNeedTarget)' != '$(CLRTestNeedTargetToBuild)'">false</_WillCLRTestProjectBuild>
+    <_WillCLRTestProjectBuild Condition="'$(CLRTestNeedTargetToBuild)' == 'targetGeneric' And '$(CLRTestNeedTarget)' == '1'">false</_WillCLRTestProjectBuild>
+    <_WillCLRTestProjectBuild Condition="'$(CLRTestNeedTargetToBuild)' == 'targetSpecific' And '$(CLRTestNeedTarget)' != '1'">false</_WillCLRTestProjectBuild>
     <_WillCLRTestProjectBuild Condition="'$(DisableProjectBuild)' == 'true'">false</_WillCLRTestProjectBuild>
   </PropertyGroup>
 
diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj
index ab16b2cda967e..562be79e4e2dc 100644
--- a/src/coreclr/tests/src/runtest.proj
+++ b/src/coreclr/tests/src/runtest.proj
@@ -65,13 +65,15 @@
 
     <Message Text="Found $(TestCount) built tests"/>
 
-    <ItemGroup Condition="$(CLRTestNeedTargetToBuild) != 1">
+    <Error Condition="'$(CLRTestNeedTargetToBuild)' != '' and '$(CLRTestNeedTargetToBuild)' != 'targetGeneric' and '$(CLRTestNeedTargetToBuild)' != 'targetSpecific'" Text="Unknown CLRTestNeedTargetToBuild $(CLRTestNeedTargetToBuild)" />
+
+    <ItemGroup Condition="'$(CLRTestNeedTargetToBuild)' != 'targetSpecific'">
       <Error Condition="'$(CLRTestPriorityToBuild)' == '0' and '$(TestCount)' &lt;= 2000" Text="Unexpected test count. Expected &gt; 2000, found $(TestCount).'" />
       <Error Condition="'$(CLRTestPriorityToBuild)' == '0' and '$(TestCount)' &gt;= 3000" Text="Unexpected test count. Expected &lt; 3000, found $(TestCount).'" />
       <Error Condition="'$(CLRTestPriorityToBuild)' == '1' and '$(TestCount)' &lt;= 9000" Text="Unexpected test count. Expected &gt; 9000, found $(TestCount).'" />
       <Error Condition="'$(CLRTestPriorityToBuild)' != '0' and '$(CLRTestPriorityToBuild)' != '1'" Text="Unknown priority $(CLRTestPriorityToBuild)" />
     </ItemGroup>
-    <ItemGroup Condition="$(CLRTestNeedTargetToBuild) == 1">
+    <ItemGroup Condition="'$(CLRTestNeedTargetToBuild)' == 'targetSpecific'">
       <Error Condition="'$(TestCount)' &lt;= 100" Text="Unexpected test count. Expected &lt; 100, found $(TestCount).'" />
     </ItemGroup>
   </Target>