diff --git a/src/coreclr/tests/src/Exceptions/Finalization/Finalizer.cs b/src/coreclr/tests/src/Exceptions/Finalization/Finalizer.cs
deleted file mode 100644
index f9a42d426e9ee..0000000000000
--- a/src/coreclr/tests/src/Exceptions/Finalization/Finalizer.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-using System;
-
-/*
-public interface IFinalize
-{
-    ~IFinalize();
-}
-
-public class Finalize : IFinalize
-{
-    ~Finalize(){ Console.WriteLine("IFinalize");}
-}
-*/
-//Test cases:
-//  Finalizers can not have a protection level (i.e Public, Protected, internal, protected internal, private)
-//  Types in namespace can only be public or internal
-// Negative:
-//  Must do checks with reflection as types are scanned at assembly load time resulting in AssemblyLoad failures
-//  Public class with finalizer
-//  internal class with finalizer
-//  Class with finalizer in Abstract base classes
-//  Wrapper classes with child classes with finalizers
-//      protected, protected internal, private
-// Positive:
-//  Platform types with finalizers
-//  Non platform type that derives from abstract platform with finalizer
-// Variations:
-//  Reflection load
-//  Startup class
-//  Attributes?
-
-public class Finalizer
-{
-    public Finalizer() { }
-    ~Finalizer() { Console.WriteLine("In Finalizer"); }
-}
-
-public class FinalizerWrapperProtected
-{
-    public FinalizerWrapperProtected()
-    {
-        FinalizerProtected fp = new FinalizerProtected();
-    }
-
-    protected class FinalizerProtected
-    {
-        public FinalizerProtected() { }
-        ~FinalizerProtected() { Console.WriteLine("In FinalizerProtected"); }
-    }
-}
-
-internal class FinalizerInternal
-{
-    public FinalizerInternal() { }
-    ~FinalizerInternal() { Console.WriteLine("In FinalizerInternal"); }
-}
-
-public class FinalizerWrapperProtectedInternal
-{
-    public FinalizerWrapperProtectedInternal()
-    {
-        FinalizerProtectedInternal fp = new FinalizerProtectedInternal();
-    }
-
-    protected internal class FinalizerProtectedInternal
-    {
-        public FinalizerProtectedInternal() { }
-        ~FinalizerProtectedInternal() { Console.WriteLine("In FinalizerProtectedInternal"); }
-    }
-}
-public class FinalizerWrapperPrivate
-{
-    public FinalizerWrapperPrivate()
-    {
-        FinalizerPrivate fp = new FinalizerPrivate();
-    }
-    private class FinalizerPrivate
-    {
-        public FinalizerPrivate() { }
-        ~FinalizerPrivate() { Console.WriteLine("In FinalizerProtectedInternal"); }
-    }
-}
-
-public abstract class FinalizerBase
-{
-    public FinalizerBase() { }
-    ~FinalizerBase() { Console.WriteLine("In FinalizerBase"); }
-}
-
-public class FinalizerAbstract : FinalizerBase
-{
-    public FinalizerAbstract() { }
-}
-
-public class FinalizerGeneric<T>
-{
-    public FinalizerGeneric(){}
-    ~FinalizerGeneric(){}
-}
-
-public class FinalizerWrapperGeneric
-{
-    public FinalizerWrapperGeneric()
-    {
-        FinalizerPrivate<int> fp = new FinalizerPrivate<int>();
-    }
-
-    private class FinalizerPrivate<T>
-    {
-        public FinalizerPrivate() { }
-        ~FinalizerPrivate() { }
-    }
-}
-
-public class Gen<T>
-{
-    public Gen() { }
-}
-
-#if STATIC
-public class Test
-{
-    public static int Main()
-    {
-        return (new Test()).RunTest();
-    }
-
-    private int RunTest()
-    {
-        try
-        {
-            RunFinalizer();
-            RunFinalizerWrapperProtected();
-            RunFinalizerInternal();
-            RunFinalizerWrapperProtectedInternal();
-            RunFinalizerWrapperPrivate();
-            RunFinalizerAbstract();
-            RunFinalizerGeneric();
-            RunFinalizerWrapperGeneric();
-            RunGeneric();
-
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine("ERROR - Caught unexpected exception");
-            Console.WriteLine(e);
-            return 1;
-        }
-        Console.WriteLine("Test PASSED");
-        return 100;
-    }
-
-    private void RunFinalizer()
-    {
-        Finalizer f = new Finalizer();
-    }
-    private void RunFinalizerWrapperProtected()
-    {
-        FinalizerWrapperProtected f = new FinalizerWrapperProtected();
-    }
-    private void RunFinalizerInternal()
-    {
-        FinalizerInternal f = new FinalizerInternal();
-    }
-    private void RunFinalizerWrapperProtectedInternal()
-    {
-        FinalizerWrapperProtectedInternal f = new FinalizerWrapperProtectedInternal();
-    }
-    private void RunFinalizerWrapperPrivate()
-    {
-        FinalizerWrapperPrivate f = new FinalizerWrapperPrivate();
-    }
-    private void RunFinalizerAbstract()
-    {
-        FinalizerAbstract f = new FinalizerAbstract();
-    }
-    private void RunFinalizerGeneric()
-    {
-        FinalizerGeneric<int> f = new FinalizerGeneric<int>();
-    }
-    private void RunFinalizerWrapperGeneric()
-    {
-        FinalizerWrapperGeneric f = new FinalizerWrapperGeneric();
-    }
-    private void RunGeneric()
-    {
-        Gen<Finalizer> gen = new Gen<Finalizer>();        
-    }
-}
-#endif
diff --git a/src/coreclr/tests/src/Exceptions/Finalization/Finalizer.csproj b/src/coreclr/tests/src/Exceptions/Finalization/Finalizer.csproj
deleted file mode 100644
index 84ac76ef217b7..0000000000000
--- a/src/coreclr/tests/src/Exceptions/Finalization/Finalizer.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Finalizer.cs" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj b/src/coreclr/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj
index 4bcddcd53b325..96b1a50a31400 100644
--- a/src/coreclr/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj
+++ b/src/coreclr/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ForeignThreadExceptions.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/AddMemoryPressureTest.csproj b/src/coreclr/tests/src/GC/API/GC/AddMemoryPressureTest.csproj
index aa559af6fe50c..108d33023306e 100644
--- a/src/coreclr/tests/src/GC/API/GC/AddMemoryPressureTest.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/AddMemoryPressureTest.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/AddThresholdTest.csproj b/src/coreclr/tests/src/GC/API/GC/AddThresholdTest.csproj
index f25fd73dfb57a..b28f179812a28 100644
--- a/src/coreclr/tests/src/GC/API/GC/AddThresholdTest.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/AddThresholdTest.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/AddUsageTest.csproj b/src/coreclr/tests/src/GC/API/GC/AddUsageTest.csproj
index 4f1457d18692c..61edd391b3876 100644
--- a/src/coreclr/tests/src/GC/API/GC/AddUsageTest.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/AddUsageTest.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/AllocateUninitializedArray.csproj b/src/coreclr/tests/src/GC/API/GC/AllocateUninitializedArray.csproj
index 127334cfb5655..41499bc43fdbf 100644
--- a/src/coreclr/tests/src/GC/API/GC/AllocateUninitializedArray.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/AllocateUninitializedArray.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AllocateUninitializedArray.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect.csproj b/src/coreclr/tests/src/GC/API/GC/Collect.csproj
index 83c8a31940be5..f63c83499536e 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect0.csproj b/src/coreclr/tests/src/GC/API/GC/Collect0.csproj
index ae87366c69755..b9852e6827c75 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect0.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect0.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect1.csproj b/src/coreclr/tests/src/GC/API/GC/Collect1.csproj
index f1ab62e50b9e7..5614f84705708 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect1.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect1.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Default_1.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Default_1.csproj
index e7fab9199a8e5..8f57c4f9dedc7 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Default_1.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Default_1.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_Default.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Default_2.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Default_2.csproj
index 51fd0e7a8620d..3d54080c946db 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Default_2.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Default_2.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_Default.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Default_3.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Default_3.csproj
index c48d64e6c5c42..f7c634662f35c 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Default_3.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Default_3.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_Default.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Forced_1.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Forced_1.csproj
index 4ed4c46e66277..af42f4bee160f 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Forced_1.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Forced_1.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Forced_2.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Forced_2.csproj
index f82b72da3aaa7..e0f46d4b1dfb2 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Forced_2.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Forced_2.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Forced_3.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Forced_3.csproj
index 50760992c988d..f68948c427168 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Forced_3.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Forced_3.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_1.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_1.csproj
index 4025d52ef0041..90698ba19d82a 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_1.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_1.csproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_Optimized.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_2.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_2.csproj
index f22a221ad8329..e4080e0820a0c 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_2.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_2.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_Optimized.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_3.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_3.csproj
index 67a51caf02d15..4974668203c45 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_3.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_Optimized_3.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_Optimized.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_fail.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_fail.csproj
index 959530623e365..586cd07c9df2e 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_fail.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_fail.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_fail.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Collect_neg.csproj b/src/coreclr/tests/src/GC/API/GC/Collect_neg.csproj
index 982a23b37cf01..905acf448213b 100644
--- a/src/coreclr/tests/src/GC/API/GC/Collect_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Collect_neg.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Collect_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/CollectionCountTest.csproj b/src/coreclr/tests/src/GC/API/GC/CollectionCountTest.csproj
index 194cbf4683b30..5212016e6e786 100644
--- a/src/coreclr/tests/src/GC/API/GC/CollectionCountTest.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/CollectionCountTest.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CollectionCountTest.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/Finalize.csproj b/src/coreclr/tests/src/GC/API/GC/Finalize.csproj
index e8b302c2e412d..fe5e039d5087f 100644
--- a/src/coreclr/tests/src/GC/API/GC/Finalize.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/Finalize.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Finalize.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj
index fc8ae6ef59251..7464113750720 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/GetGeneration.csproj b/src/coreclr/tests/src/GC/API/GC/GetGeneration.csproj
index 2f9d757fbfa07..ed537d44d582a 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetGeneration.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetGeneration.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetGeneration.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/GetGenerationWR.csproj b/src/coreclr/tests/src/GC/API/GC/GetGenerationWR.csproj
index 2e00772023bc8..755022a8b246d 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetGenerationWR.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetGenerationWR.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetGenerationWR.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/GetGenerationWR2.csproj b/src/coreclr/tests/src/GC/API/GC/GetGenerationWR2.csproj
index 9734c3c9cb65c..7fb316e5a064b 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetGenerationWR2.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetGenerationWR2.csproj
@@ -8,8 +8,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetGenerationWR2.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/GetGeneration_box.csproj b/src/coreclr/tests/src/GC/API/GC/GetGeneration_box.csproj
index 0d0f2a800e81f..1abd1e9906a99 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetGeneration_box.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetGeneration_box.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetGeneration_box.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/GetGeneration_fail.csproj b/src/coreclr/tests/src/GC/API/GC/GetGeneration_fail.csproj
index df7582ec6cbcb..f6ac71b6b7f85 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetGeneration_fail.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetGeneration_fail.csproj
@@ -6,8 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetGeneration_fail.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj
index c8ce241afdad9..57df5c48d423c 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/GetTotalMemory.csproj b/src/coreclr/tests/src/GC/API/GC/GetTotalMemory.csproj
index 58d9ce5ee1bb6..f2dcbc0e03cd1 100644
--- a/src/coreclr/tests/src/GC/API/GC/GetTotalMemory.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/GetTotalMemory.csproj
@@ -8,8 +8,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GetTotalMemory.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/KeepAlive.csproj b/src/coreclr/tests/src/GC/API/GC/KeepAlive.csproj
index 5af9d94db5d61..308c0fb740cb2 100644
--- a/src/coreclr/tests/src/GC/API/GC/KeepAlive.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/KeepAlive.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="KeepAlive.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/KeepAliveNull.csproj b/src/coreclr/tests/src/GC/API/GC/KeepAliveNull.csproj
index ca1bad67a3ec3..1c4d5f7167e38 100644
--- a/src/coreclr/tests/src/GC/API/GC/KeepAliveNull.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/KeepAliveNull.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="KeepAliveNull.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/KeepAliveRecur.csproj b/src/coreclr/tests/src/GC/API/GC/KeepAliveRecur.csproj
index ecb03b8f2d9b7..ae0789f10daec 100644
--- a/src/coreclr/tests/src/GC/API/GC/KeepAliveRecur.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/KeepAliveRecur.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/MaxGeneration.csproj b/src/coreclr/tests/src/GC/API/GC/MaxGeneration.csproj
index 8dfab983b42ed..20539e8b3361c 100644
--- a/src/coreclr/tests/src/GC/API/GC/MaxGeneration.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/MaxGeneration.csproj
@@ -6,8 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MaxGeneration.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize.csproj b/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize.csproj
index d5d669596f58d..ae6b4fb0116a2 100644
--- a/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReRegisterForFinalize.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj b/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj
index 95649c1e9a158..88d435668d96f 100644
--- a/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReRegisterForFinalize_null.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj b/src/coreclr/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj
index da95e18e6cb99..bb01dcdf950c7 100644
--- a/src/coreclr/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="RemoveMemoryPressureTest.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/RemoveUsageTest.csproj b/src/coreclr/tests/src/GC/API/GC/RemoveUsageTest.csproj
index 8a536eca2d191..0e107d5875198 100644
--- a/src/coreclr/tests/src/GC/API/GC/RemoveUsageTest.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/RemoveUsageTest.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GC/SuppressFinalize.csproj b/src/coreclr/tests/src/GC/API/GC/SuppressFinalize.csproj
index 833353b68c84e..cec0f4d9966fb 100644
--- a/src/coreclr/tests/src/GC/API/GC/SuppressFinalize.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/SuppressFinalize.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SuppressFinalize.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/SuppressFinalize_Null.csproj b/src/coreclr/tests/src/GC/API/GC/SuppressFinalize_Null.csproj
index f56c03828e2d9..127a1cf08c37b 100644
--- a/src/coreclr/tests/src/GC/API/GC/SuppressFinalize_Null.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/SuppressFinalize_Null.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SuppressFinalize_Null.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/TotalMemory.csproj b/src/coreclr/tests/src/GC/API/GC/TotalMemory.csproj
index dbb34a22ee57b..c98e67f9b1dcb 100644
--- a/src/coreclr/tests/src/GC/API/GC/TotalMemory.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/TotalMemory.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TotalMemory.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GC/TotalMemory2.csproj b/src/coreclr/tests/src/GC/API/GC/TotalMemory2.csproj
index 0ef2774ea5428..05fccbfd27106 100644
--- a/src/coreclr/tests/src/GC/API/GC/TotalMemory2.csproj
+++ b/src/coreclr/tests/src/GC/API/GC/TotalMemory2.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TotalMemory2.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj b/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj
index 7812e1071dbad..5d5995864f428 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AddrOfPinnedObject.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj b/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj
index e4af092c8c9ce..2b9241bfbcd36 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AddrOfPinnedObject_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Alloc.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Alloc.csproj
index 99775810af11b..9bca1f7f47530 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Alloc.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Alloc.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Alloc.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg.csproj
index cfbbf15e6fdad..c69256d889aa8 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Alloc_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg2.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg2.csproj
index a72cd47f93527..3c0d036f3ba90 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg2.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Alloc_neg2.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Alloc_neg2.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Casting.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Casting.csproj
index 309461fbeabff..510b17aac585f 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Casting.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Casting.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Casting.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Equality.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Equality.csproj
index d8f7f84b0df3a..3ea3368efbf78 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Equality.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Equality.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Equality.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Free.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Free.csproj
index 2affd95aceb10..0d6d7e862450f 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Free.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Free.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Free.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Free_neg.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Free_neg.csproj
index a45098bb7c6b0..36279f7400b99 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Free_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Free_neg.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Free_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/HandleCopy.csproj b/src/coreclr/tests/src/GC/API/GCHandle/HandleCopy.csproj
index ee18c987fafbc..87252e3288c7e 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/HandleCopy.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/HandleCopy.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="HandleCopy.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/IsAllocated.csproj b/src/coreclr/tests/src/GC/API/GCHandle/IsAllocated.csproj
index 27d00c225ee1b..a99488d00135a 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/IsAllocated.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/IsAllocated.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IsAllocated.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Normal.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Normal.csproj
index 16d2ac27c3b0d..639c06d441746 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Normal.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Normal.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Normal.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/PinObj_neg.csproj b/src/coreclr/tests/src/GC/API/GCHandle/PinObj_neg.csproj
index 2bf99fd27398b..88b89f5f4a3ad 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/PinObj_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/PinObj_neg.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PinObj_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Pinned.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Pinned.csproj
index 8176732f57695..73491ac615794 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Pinned.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Pinned.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Pinned.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Target.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Target.csproj
index 33348c88f567f..88a5444935211 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Target.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Target.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Target.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Target_neg.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Target_neg.csproj
index 0ecff586ed8c8..f336cf89c9e18 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Target_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Target_neg.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Target_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj b/src/coreclr/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj
index a1a3746790570..002849ac72f67 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ToFromIntPtr.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandle/Weak.csproj b/src/coreclr/tests/src/GC/API/GCHandle/Weak.csproj
index 857d2a0bdb6f3..8ae51211427b4 100644
--- a/src/coreclr/tests/src/GC/API/GCHandle/Weak.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandle/Weak.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <PropertyGroup>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
diff --git a/src/coreclr/tests/src/GC/API/GCHandleCollector/Count.csproj b/src/coreclr/tests/src/GC/API/GCHandleCollector/Count.csproj
index e242bc9504974..e5803f9590d91 100644
--- a/src/coreclr/tests/src/GC/API/GCHandleCollector/Count.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandleCollector/Count.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Count.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj b/src/coreclr/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj
index 0d6fa5c80e1b4..99d8c3aefaad2 100644
--- a/src/coreclr/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CtorsAndProperties.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandleCollector/NegTests.csproj b/src/coreclr/tests/src/GC/API/GCHandleCollector/NegTests.csproj
index 95cdd0687a4b4..b162eea2c8b54 100644
--- a/src/coreclr/tests/src/GC/API/GCHandleCollector/NegTests.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandleCollector/NegTests.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NegTests.cs" />
diff --git a/src/coreclr/tests/src/GC/API/GCHandleCollector/Usage.csproj b/src/coreclr/tests/src/GC/API/GCHandleCollector/Usage.csproj
index 1ccf8315be184..9500555357d45 100644
--- a/src/coreclr/tests/src/GC/API/GCHandleCollector/Usage.csproj
+++ b/src/coreclr/tests/src/GC/API/GCHandleCollector/Usage.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/API/GCSettings/InputValidation.csproj b/src/coreclr/tests/src/GC/API/GCSettings/InputValidation.csproj
index 2b4d75709c25a..d9b649833ac9e 100644
--- a/src/coreclr/tests/src/GC/API/GCSettings/InputValidation.csproj
+++ b/src/coreclr/tests/src/GC/API/GCSettings/InputValidation.csproj
@@ -6,8 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InputValidation.cs" />
diff --git a/src/coreclr/tests/src/GC/API/NoGCRegion/NoGC.csproj b/src/coreclr/tests/src/GC/API/NoGCRegion/NoGC.csproj
index ba59bda5206bd..922c42de6b3e7 100644
--- a/src/coreclr/tests/src/GC/API/NoGCRegion/NoGC.csproj
+++ b/src/coreclr/tests/src/GC/API/NoGCRegion/NoGC.csproj
@@ -8,8 +8,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NoGC.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/Finalize.csproj b/src/coreclr/tests/src/GC/API/WeakReference/Finalize.csproj
index 12f35dece63dd..e8723dbc5630a 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/Finalize.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/Finalize.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Finalize.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/Finalize2.csproj b/src/coreclr/tests/src/GC/API/WeakReference/Finalize2.csproj
index c3c77cc1c7f5b..0c6869d9a2863 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/Finalize2.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/Finalize2.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Finalize2.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/IsAlive.csproj b/src/coreclr/tests/src/GC/API/WeakReference/IsAlive.csproj
index 3ed436890f43a..b6fc8222d2c9d 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/IsAlive.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/IsAlive.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/IsAlive_neg.csproj b/src/coreclr/tests/src/GC/API/WeakReference/IsAlive_neg.csproj
index ea01103f5ad87..00324dc1ad737 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/IsAlive_neg.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/IsAlive_neg.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IsAlive_neg.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/NullHandle.csproj b/src/coreclr/tests/src/GC/API/WeakReference/NullHandle.csproj
index 51a119e44c593..1910559b5b956 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/NullHandle.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/NullHandle.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullHandle.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/Target.csproj b/src/coreclr/tests/src/GC/API/WeakReference/Target.csproj
index 33348c88f567f..88a5444935211 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/Target.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/Target.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Target.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/TrackResurrection.csproj b/src/coreclr/tests/src/GC/API/WeakReference/TrackResurrection.csproj
index 67b1330bc24e1..ee6c76b610cf4 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/TrackResurrection.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/TrackResurrection.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TrackResurrection.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs.csproj b/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs.csproj
index 0c0e56ae3822f..faf1dc4b5ae4f 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs.csproj
@@ -6,8 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="multipleWRs.cs" />
diff --git a/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs_1.csproj b/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs_1.csproj
index 83d08f07076de..8672dd9e41a09 100644
--- a/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs_1.csproj
+++ b/src/coreclr/tests/src/GC/API/WeakReference/multipleWRs_1.csproj
@@ -6,8 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="multipleWRs.cs" />
diff --git a/src/coreclr/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj b/src/coreclr/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj
index e6c2af1c6923e..bb47f926fe14a 100644
--- a/src/coreclr/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj
+++ b/src/coreclr/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj
@@ -7,8 +7,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="bestfit.cs" />
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/Allocation.csproj b/src/coreclr/tests/src/GC/Performance/Tests/Allocation.csproj
index 4e11fdb45a989..edf669da225ac 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/Allocation.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/Allocation.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj b/src/coreclr/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj
index 35e2906a1ee52..cbc41ccd66964 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/EEGC.csproj b/src/coreclr/tests/src/GC/Performance/Tests/EEGC.csproj
index bb4aa104a8dc7..6b0619f825872 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/EEGC.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/EEGC.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/GCHandle.csproj b/src/coreclr/tests/src/GC/Performance/Tests/GCHandle.csproj
index 99cdbe7755e48..035093d0815c5 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/GCHandle.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/GCHandle.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/GCLarge.csproj b/src/coreclr/tests/src/GC/Performance/Tests/GCLarge.csproj
index 68d0ba12761ba..5b82d0198704b 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/GCLarge.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/GCLarge.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/GCPerf.csproj b/src/coreclr/tests/src/GC/Performance/Tests/GCPerf.csproj
index 22a51ac0b6c9d..300072e80ca00 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/GCPerf.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/GCPerf.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/GCSimulator.csproj b/src/coreclr/tests/src/GC/Performance/Tests/GCSimulator.csproj
index c5633cb9da9b1..866b791d7bcc5 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/GCSimulator.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/GCSimulator.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/GCSmall.csproj b/src/coreclr/tests/src/GC/Performance/Tests/GCSmall.csproj
index cd9a612315483..0d72befa70b24 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/GCSmall.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/GCSmall.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/LOHSmooth.csproj b/src/coreclr/tests/src/GC/Performance/Tests/LOHSmooth.csproj
index 85f6a424bcbf8..5ff2e8b110143 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/LOHSmooth.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/LOHSmooth.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/LargeStrings.csproj b/src/coreclr/tests/src/GC/Performance/Tests/LargeStrings.csproj
index c940760e4c252..80fed7e508a4e 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/LargeStrings.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/LargeStrings.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/LowLatency.csproj b/src/coreclr/tests/src/GC/Performance/Tests/LowLatency.csproj
index df395bf06e6d6..4769b20ec55de 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/LowLatency.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/LowLatency.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfLargeArray.csproj b/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfLargeArray.csproj
index 72758909b35ac..6e2c6bffa3629 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfLargeArray.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfLargeArray.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfList.csproj b/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfList.csproj
index 7fadb99cb695b..7205cb9042e3f 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfList.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/MarkingCardOfList.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/MemoryPressure.csproj b/src/coreclr/tests/src/GC/Performance/Tests/MemoryPressure.csproj
index f81f9766f0fc6..d2f98c2365b1d 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/MemoryPressure.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/MemoryPressure.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/MicroBench.csproj b/src/coreclr/tests/src/GC/Performance/Tests/MicroBench.csproj
index 11b79a828c8ba..6f0e58dd573f9 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/MicroBench.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/MicroBench.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/MidLife.csproj b/src/coreclr/tests/src/GC/Performance/Tests/MidLife.csproj
index cef012df61c89..4fb14e0384823 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/MidLife.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/MidLife.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/ServerSpin.csproj b/src/coreclr/tests/src/GC/Performance/Tests/ServerSpin.csproj
index 470f54e7074b8..690eeb9a8069d 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/ServerSpin.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/ServerSpin.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/ToBoxOrNot.csproj b/src/coreclr/tests/src/GC/Performance/Tests/ToBoxOrNot.csproj
index ad428cf3d4a7a..c2b8ab8827cd1 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/ToBoxOrNot.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/ToBoxOrNot.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/WeakReference.csproj b/src/coreclr/tests/src/GC/Performance/Tests/WeakReference.csproj
index 7f293c837fcd5..e7ef6adc5d872 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/WeakReference.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/WeakReference.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Performance/Tests/XMLReader.csproj b/src/coreclr/tests/src/GC/Performance/Tests/XMLReader.csproj
index 3217aa20db634..98879307c987d 100644
--- a/src/coreclr/tests/src/GC/Performance/Tests/XMLReader.csproj
+++ b/src/coreclr/tests/src/GC/Performance/Tests/XMLReader.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj
index 8ade8b647e97e..33704a18cf8bf 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj
index 51a8f343e7d5f..2f64ced8488de 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj
index 1e6a1917ab472..c20fb461662a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj
index 1d490e74f7529..96fbaf99a019d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj
index 7533506953791..012217c8a5906 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj
index 1e6a1917ab472..c20fb461662a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj
index 0134f15387ed6..7617b8089b0fc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj
index d623daf2ee71a..711766a98ab15 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj
index 7c87e26ef04bf..76994b5d0a773 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj
index dea4cc8271cea..5d8be7169811a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj
index 752f8ce9afcfc..5be171beb1b05 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj
index 7256844fb9e16..e4d61fd6f03da 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj
index a325bb37b20f7..53b8067609898 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj
index 286fcb7281eb3..d99ed85f28c12 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj
index 817da0f242124..c273564157b08 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj
index 70ec9b0058448..134d01e2a5411 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj
index 8dff7aa23f2a8..65c33b9943e08 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj
index 522988d70e821..df66dfc0565e8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj
index 127bea95c4e90..dc72894424705 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj
index d3428da239d00..302b3e173fd68 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj
index d3428da239d00..302b3e173fd68 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj
index a06397a24ab97..492cbabb12eb1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj
index a06397a24ab97..492cbabb12eb1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj
index 898478d850dcd..783b49694bfa6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj
index 2b44ce964afe3..03caef334c49a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj
index 7c6d9d17ef2c9..e30ddb55da894 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj
index c905a9815e358..66884f1147ba0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj
index 89bc9773c285f..4770a27821326 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj
index 80aba9e5c7ffa..4bd15ba529c91 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj
index 48692a86cdfc8..5cb8d3822db8a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj
index 48692a86cdfc8..5cb8d3822db8a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj
index 48692a86cdfc8..5cb8d3822db8a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj
index 638dc4d775f68..df8a115294f48 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj
index 2714fa7385f6c..801436c4c3d71 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj
index d1bd70cef2d44..5b2e977a30116 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj
index 855ae27104cec..d10fb0f5a02f3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj
index 18c44a2112a95..874ddd92167d1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj
index 82fbee4eeaa57..78d8a62a979a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj
index db99928a7a911..556ca15a1872a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj
index 50c4d449655ed..0144a617fb849 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj
index a8ce0b9040545..80005b7e868b2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj
index 3f7bb99c15555..64d9d9d1d7a83 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj
index 464ea5e969848..aa24282b0a65e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj
index 0476b933b1f41..4a9bf4edad6ec 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj
index a5363e1b195f6..a1bbfbc2849c6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj
index f068be6d41438..05b1ed039bc0e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj
index a5363e1b195f6..a1bbfbc2849c6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj
index 7ab2306c044c1..ccf5947b11374 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj
index c959d9a292ddd..7027d52c48dda 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj
index eda0cf74e7859..2b33f72ab9b94 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj
index 4d1f695c89cd8..e29e195109b2c 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj
index 66e2bc987c899..ab959f266cd6f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj
index 1007893f5c102..32e7ec39e8f49 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj
index de079444dc4b7..073f7504bd98d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj
index 13d0474971303..de49f603622bd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj
index 074c3c6cdeeb0..a61ae5a3d9b25 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 8517 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj
index f068be6d41438..05b1ed039bc0e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj
index f42557bf3327c..c1495acea9b11 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj
index a8e24e5abef44..da8a2c734ffca 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj
index 7cf78d4a466f1..846ed5c47e625 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj
index ce6f22002afd1..72c3f699b17ce 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj
index 29bc50f4d76dc..2748efc155368 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj
index f25d261798d14..26349978558b4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj
index 1ecaa32ff65f2..84237df997b7e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj
index 4ccd1886c8b94..e6cf3f76978bc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj
index 8a8aa59a635c2..d5d0e4912bb90 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj
index 669f91426c6f0..701ca4e9e6b6d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj
index 2eb4bad014dff..6aa1933c2270f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj
index 3a6995de7c952..028a7274af8c4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj
index 00eb441218390..6f16ab50e5b14 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj
index db2e7b98bdd7b..544f1a4cd5402 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj
index 2342330ddacdb..16a515e8a764b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 7 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj
index 8dff7aa23f2a8..65c33b9943e08 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj
index 0134f15387ed6..7617b8089b0fc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj
index 898478d850dcd..783b49694bfa6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj
index 50c4d449655ed..0144a617fb849 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj
index dea4cc8271cea..5d8be7169811a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj
index 1e6a1917ab472..c20fb461662a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj
index b2770ce23d18a..2a14642c32d20 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj
index 7246aab067698..cd06c16f64079 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj
index 1e6927107d991..9edde8a13e995 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj
index 638dc4d775f68..df8a115294f48 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj
index c959d9a292ddd..7027d52c48dda 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj
index 4d3e4a69fc37b..ba37efeb969c5 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 30000 -sdc 6000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj
index 4a75344b578ef..3bde7d8ba7812 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 6000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj
index 0e5daa0a3a1c9..494dccb6cb99d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj
index 1d490e74f7529..96fbaf99a019d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj
index 670adb9da8dc3..d7c170c45daae 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj
index dea4cc8271cea..5d8be7169811a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj
index 7c59cca6fa1e2..2e377b9748689 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj
index 3e92056173dcd..eec4ad57fdce8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj
index dea4cc8271cea..5d8be7169811a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj
index 82537ed851a8b..3836d973d32fb 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj
index 1e6a1917ab472..c20fb461662a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj
index 3e92056173dcd..eec4ad57fdce8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj
index 82537ed851a8b..3836d973d32fb 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj
index b2770ce23d18a..2a14642c32d20 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj
index c6ef8c91293c2..759b9164b2bf6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj
index 89f52e94e18a4..27cfb2a286cc4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj
index 38b9f8bd1dd67..276f9334e8b5f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj
index b2770ce23d18a..2a14642c32d20 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj
index ace26d62029d8..52fc21955e82e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj
index 259b7cb2545ed..dc840d315bf6f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj
index 3aaaa90139444..ee226f0d7f2cd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj
index 18c07df3969b5..540b1a9d9df0c 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj
index c97615eb9b4b6..15bb7a391f0e3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj
index d4d29a24116a1..1a466dc33f6e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj
index c6ef8c91293c2..759b9164b2bf6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj
index e8383112e40b3..5cf8c40cf9ae0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj
index 210b0b367609d..36209bc834d76 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj
index f60008cd0908b..31dd15f343bea 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj
index cecc8c5c4b449..46a10a2a7572d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj
index 79cc74471ab64..8d5cf4e0558f0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj
index 263d946ed08fa..011b15061d519 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj
index 39778ee066d28..7e1bbc546d4ae 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj
index bcadf10ac0e48..e62c4b7176406 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj
index d4d29a24116a1..1a466dc33f6e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj
index 3ef1cd1b23133..43de53613af6e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj
index 89f52e94e18a4..27cfb2a286cc4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj
index 7888b15a597bd..01166ccac90e6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj
index 2772998389eed..c6d9edcf8b7ca 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj
index 01e6cc97b6068..26d778ffb7b47 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj
index cfef360530791..7787a4ad30b73 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj
index 91bcb86b22027..75e9c9f683ec7 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj
index a82a5b95b4a3b..62bcf96545d0b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj
index 1e37a1b7966f6..0240c30d86519 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj
index 61b2823fc6603..3fa4024abb4a9 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj
index 4e2cd5ffcc8ae..d4587eefbcd5d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj
index 7945a440e5c25..9e14c74fafe28 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj
index 38b9f8bd1dd67..276f9334e8b5f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj
index 54a28de7f4baa..586733243df7a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj
index 4897725691ad7..6c95efb6694ba 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj
index e509f5b5b71fb..d7adc5ab953b0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj
index 48a3a80f3159e..d78442ca4f3ad 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj
index 6dfb84790ba76..b7c01e6547970 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj
index 4fe7295082712..6ffbbc85cd1bf 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj
index e545ac70ffc08..80aa9896a805b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj
index a5084c8fef55e..270438c10bbe3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj
index b226d95e8a12b..9851e49b713c8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj
index b8eb6979bf579..0336802ae1c59 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj
index ace26d62029d8..52fc21955e82e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj
index 7945a440e5c25..9e14c74fafe28 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj
index 7f89faf26cbea..48ab93010646f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj
index 014886d5fe3ba..956d9a900bbc6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj
index 1d8129f058e99..60f29c59d5434 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj
index 0c53338c8e0d0..e3c3ac60e6ab3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj
index a9cd836848b58..d6b98226a9bfd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj
index 13ddd2804dcaa..67ab6bd824176 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj
index bf72f9d28cca8..c80f863766f1f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj
index ede3753acc939..a7d236a73529f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj
index a506297edd71a..11504d1021cbc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj
index 259b7cb2545ed..dc840d315bf6f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj
index e58670225f7f0..e8e4d61c691d2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj
index 97e53cb23f5b1..d39657c9aff0d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj
index 04c6afc2c9e66..58c7cf143b53e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj
index 215a08ddcf395..98300d3b03fed 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj
index e49bc52a4bc0c..fec6f45e201fb 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj
index 2e50baebc5440..24e9aca2c8a27 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj
index cede255068c34..7466d4ba659e1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj
index 27fbedfd9ee57..903cbccb46fc1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj
index bb7d61f14990b..8c5f01813d011 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj
index 8e9e61661207d..f098dac86a1e3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj
index 3aaaa90139444..ee226f0d7f2cd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj
index 419e7e16f7c86..8af962a65f8f8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj
index bb420e9edfa8f..59c324471ccc5 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj
index 93c75c663d153..5f5c5aa3618aa 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj
index 2469cfeef663b..6ec4122cdbb0b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj
index e5f05300825c2..99f6bf7594354 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj
index f246e52e2e545..041dda8372db0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj
index 18c07df3969b5..540b1a9d9df0c 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj
index 51a8f343e7d5f..2f64ced8488de 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj
index c97615eb9b4b6..15bb7a391f0e3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj
index 1e6a1917ab472..c20fb461662a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj
index 1d490e74f7529..96fbaf99a019d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj
index 7533506953791..012217c8a5906 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj
index 1e6a1917ab472..c20fb461662a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj
index 0134f15387ed6..7617b8089b0fc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj
index d623daf2ee71a..711766a98ab15 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj
index 7c87e26ef04bf..76994b5d0a773 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj
index 752f8ce9afcfc..5be171beb1b05 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj
index 7256844fb9e16..e4d61fd6f03da 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj
index a325bb37b20f7..53b8067609898 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj
index 286fcb7281eb3..d99ed85f28c12 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj
index 817da0f242124..c273564157b08 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj
index 70ec9b0058448..134d01e2a5411 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj
index 8dff7aa23f2a8..65c33b9943e08 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj
index 522988d70e821..df66dfc0565e8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj
index d4d29a24116a1..1a466dc33f6e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj
index 127bea95c4e90..dc72894424705 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj
index d3428da239d00..302b3e173fd68 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj
index d3428da239d00..302b3e173fd68 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj
index a06397a24ab97..492cbabb12eb1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj
index a06397a24ab97..492cbabb12eb1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj
index 898478d850dcd..783b49694bfa6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj
index 2b44ce964afe3..03caef334c49a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj
index 7c6d9d17ef2c9..e30ddb55da894 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj
index c905a9815e358..66884f1147ba0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj
index 89bc9773c285f..4770a27821326 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj
index 80aba9e5c7ffa..4bd15ba529c91 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj
index 48692a86cdfc8..5cb8d3822db8a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj
index 48692a86cdfc8..5cb8d3822db8a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj
index 48692a86cdfc8..5cb8d3822db8a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj
index 638dc4d775f68..df8a115294f48 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj
index 2714fa7385f6c..801436c4c3d71 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj
index d1bd70cef2d44..5b2e977a30116 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj
index 855ae27104cec..d10fb0f5a02f3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj
index 78ffe7cba3c1b..f04a81cbbf7e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj
index 18c44a2112a95..874ddd92167d1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj
index 82fbee4eeaa57..78d8a62a979a2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj
index db99928a7a911..556ca15a1872a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj
index 50c4d449655ed..0144a617fb849 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj
index a8ce0b9040545..80005b7e868b2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj
index 3f7bb99c15555..64d9d9d1d7a83 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj
index 464ea5e969848..aa24282b0a65e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj
index 0476b933b1f41..4a9bf4edad6ec 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj
index e8383112e40b3..5cf8c40cf9ae0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj
index a5363e1b195f6..a1bbfbc2849c6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj
index f068be6d41438..05b1ed039bc0e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj
index a5363e1b195f6..a1bbfbc2849c6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj
index 7ab2306c044c1..ccf5947b11374 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj
index c959d9a292ddd..7027d52c48dda 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj
index eda0cf74e7859..2b33f72ab9b94 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj
index 4d1f695c89cd8..e29e195109b2c 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj
index 66e2bc987c899..ab959f266cd6f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj
index 1007893f5c102..32e7ec39e8f49 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj
index de079444dc4b7..073f7504bd98d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj
index 210b0b367609d..36209bc834d76 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj
index 13d0474971303..de49f603622bd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj
index 074c3c6cdeeb0..a61ae5a3d9b25 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 8517 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj
index f068be6d41438..05b1ed039bc0e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj
index f42557bf3327c..c1495acea9b11 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj
index a8e24e5abef44..da8a2c734ffca 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj
index 7cf78d4a466f1..846ed5c47e625 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj
index ce6f22002afd1..72c3f699b17ce 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj
index 29bc50f4d76dc..2748efc155368 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj
index f25d261798d14..26349978558b4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj
index 1ecaa32ff65f2..84237df997b7e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj
index f60008cd0908b..31dd15f343bea 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj
index 4ccd1886c8b94..e6cf3f76978bc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj
index 8a8aa59a635c2..d5d0e4912bb90 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj
index 669f91426c6f0..701ca4e9e6b6d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj
index 2eb4bad014dff..6aa1933c2270f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj
index 3a6995de7c952..028a7274af8c4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj
index 00eb441218390..6f16ab50e5b14 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj
index db2e7b98bdd7b..544f1a4cd5402 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj
index 2342330ddacdb..16a515e8a764b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 7 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj
index 8dff7aa23f2a8..65c33b9943e08 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj
index 0134f15387ed6..7617b8089b0fc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj
index cecc8c5c4b449..46a10a2a7572d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj
index 898478d850dcd..783b49694bfa6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj
index 50c4d449655ed..0144a617fb849 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj
index b2770ce23d18a..2a14642c32d20 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj
index 7246aab067698..cd06c16f64079 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj
index 1e6927107d991..9edde8a13e995 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj
index 638dc4d775f68..df8a115294f48 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj
index c959d9a292ddd..7027d52c48dda 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj
index 4d3e4a69fc37b..ba37efeb969c5 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 30000 -sdc 6000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj
index 4a75344b578ef..3bde7d8ba7812 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 6000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj
index 0e5daa0a3a1c9..494dccb6cb99d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj
index 79cc74471ab64..8d5cf4e0558f0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj
index 1d490e74f7529..96fbaf99a019d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj
index c590fd8aba9e8..6d6301694fdce 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 7 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.1 -dw 0.0 -f</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj
index 8da7b118ffbef..826c77e9983a8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 8 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.2 -dw 0.0 -f</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj
index 7517ac70537df..3af1996bf8f92 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 10 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.2 -dw 0.0 -f</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj
index a06a43f173984..99f5959f828f1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 10 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.3 -dw 0.0 -f</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj
index 5bb7a348ada08..72dea60b19d61 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 8 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.3 -dw 0.1 -f</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj
index 263d946ed08fa..011b15061d519 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj
index a506297edd71a..11504d1021cbc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj
index 876508ef4ecee..d1ba5a05313dd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj
index 89bc9773c285f..4770a27821326 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj
index 39778ee066d28..7e1bbc546d4ae 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj
index bcadf10ac0e48..e62c4b7176406 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj
index d4d29a24116a1..1a466dc33f6e4 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj
index 3ef1cd1b23133..43de53613af6e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj
index 7888b15a597bd..01166ccac90e6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj
index 2772998389eed..c6d9edcf8b7ca 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj
index 4b038d9036924..1b21ec0345524 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj
index 01e6cc97b6068..26d778ffb7b47 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj
index cfef360530791..7787a4ad30b73 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj
index 91bcb86b22027..75e9c9f683ec7 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj
index a82a5b95b4a3b..62bcf96545d0b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj
index 1e37a1b7966f6..0240c30d86519 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj
index 61b2823fc6603..3fa4024abb4a9 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj
index 4e2cd5ffcc8ae..d4587eefbcd5d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj
index 7945a440e5c25..9e14c74fafe28 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj
index 54a28de7f4baa..586733243df7a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj
index 4897725691ad7..6c95efb6694ba 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj
index a094e8cb45349..4c3e01e436eb0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj
index e509f5b5b71fb..d7adc5ab953b0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj
index 48a3a80f3159e..d78442ca4f3ad 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj
index 6dfb84790ba76..b7c01e6547970 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj
index 4fe7295082712..6ffbbc85cd1bf 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj
index e545ac70ffc08..80aa9896a805b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj
index a5084c8fef55e..270438c10bbe3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj
index b226d95e8a12b..9851e49b713c8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj
index b8eb6979bf579..0336802ae1c59 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj
index 7945a440e5c25..9e14c74fafe28 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj
index 7f89faf26cbea..48ab93010646f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj
index 7c59cca6fa1e2..2e377b9748689 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj
index 014886d5fe3ba..956d9a900bbc6 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj
index 1d8129f058e99..60f29c59d5434 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj
index 0c53338c8e0d0..e3c3ac60e6ab3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj
index a9cd836848b58..d6b98226a9bfd 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj
index 13ddd2804dcaa..67ab6bd824176 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj
index bf72f9d28cca8..c80f863766f1f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj
index ede3753acc939..a7d236a73529f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj
index a506297edd71a..11504d1021cbc 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj
index e58670225f7f0..e8e4d61c691d2 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj
index 97e53cb23f5b1..d39657c9aff0d 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj
index 04c6afc2c9e66..58c7cf143b53e 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj
index e49bc52a4bc0c..fec6f45e201fb 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj
index 2e50baebc5440..24e9aca2c8a27 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj
index cede255068c34..7466d4ba659e1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj
index 27fbedfd9ee57..903cbccb46fc1 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj
index bb7d61f14990b..8c5f01813d011 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj
index 8e9e61661207d..f098dac86a1e3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj
index 419e7e16f7c86..8af962a65f8f8 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj
index bb420e9edfa8f..59c324471ccc5 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj
index 93c75c663d153..5f5c5aa3618aa 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj
index 2469cfeef663b..6ec4122cdbb0b 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj
index e5f05300825c2..99f6bf7594354 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj
index f246e52e2e545..041dda8372db0 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj
index 465f7bd06b250..779db315bc42a 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj
index aeda1f0d4acd2..a4f12d0d4f529 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj
index 7c86e43b00906..405e1ef3c4bfe 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj
index 6791171cb5b7e..80f06f2e6339f 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj
index 02878b8cceced..fe5f4929ae2be 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj
index 6536793edf37c..f68af2aea62a3 100644
--- a/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
     <IsGCSimulatorTest>true</IsGCSimulatorTest>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/src/coreclr/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj b/src/coreclr/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
index 3169fea772b1a..e72aa92571f55 100644
--- a/src/coreclr/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
@@ -6,7 +6,7 @@
     <GenerateRunScript>false</GenerateRunScript>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
     <CLRTestPriority>0</CLRTestPriority>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
+    <DefineConstants>$(DefineConstants);PROJECTK_BUILD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DetourHelpers.cs" />
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/573277.csproj b/src/coreclr/tests/src/GC/Stress/Tests/573277.csproj
index a3492ecf23668..a762a0c556ec3 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/573277.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/573277.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/ExpandHeap.csproj b/src/coreclr/tests/src/GC/Stress/Tests/ExpandHeap.csproj
index 9816c8942cd40..0ff9d5c05fef4 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/ExpandHeap.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/ExpandHeap.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/GCQueue.csproj b/src/coreclr/tests/src/GC/Stress/Tests/GCQueue.csproj
index e665c00615788..a4902e26eedb2 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/GCQueue.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/GCQueue.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/GCSimulator.csproj b/src/coreclr/tests/src/GC/Stress/Tests/GCSimulator.csproj
index 804e914b21e86..8cc3a019c2f4d 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/GCSimulator.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/GCSimulator.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/GCVariant.csproj b/src/coreclr/tests/src/GC/Stress/Tests/GCVariant.csproj
index 0063cb9afa1b0..4c7f6778a172e 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/GCVariant.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/GCVariant.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LeakGenThrd.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LeakGenThrd.csproj
index e9f85081ff70b..cc01ecb3f9944 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/LeakGenThrd.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LeakGenThrd.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/MulDimJagAry.csproj b/src/coreclr/tests/src/GC/Stress/Tests/MulDimJagAry.csproj
index 07c1b43448e2e..1ccee7652a40c 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/MulDimJagAry.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/MulDimJagAry.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/PlugGaps.csproj b/src/coreclr/tests/src/GC/Stress/Tests/PlugGaps.csproj
index a322da285afef..337a94817609d 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/PlugGaps.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/PlugGaps.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/SingLinkStay.csproj b/src/coreclr/tests/src/GC/Stress/Tests/SingLinkStay.csproj
index a90a125224fa0..2dea0a124aaa2 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/SingLinkStay.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/SingLinkStay.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/StressAllocator.csproj b/src/coreclr/tests/src/GC/Stress/Tests/StressAllocator.csproj
index 27f62bf253ac2..12b85ee6189ec 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/StressAllocator.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/StressAllocator.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj b/src/coreclr/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj
index 01547f74086a0..bcb2752260e35 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/allocationwithpins.csproj b/src/coreclr/tests/src/GC/Stress/Tests/allocationwithpins.csproj
index 80c62c77073a2..8c8ff708704a4 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/allocationwithpins.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/allocationwithpins.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/b115557.csproj b/src/coreclr/tests/src/GC/Stress/Tests/b115557.csproj
index 84ede62c82db0..81f637d927ff9 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/b115557.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/b115557.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/bestfit-finalize.csproj b/src/coreclr/tests/src/GC/Stress/Tests/bestfit-finalize.csproj
index 6fef5c5e425e6..5c212c8b64da5 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/bestfit-finalize.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/bestfit-finalize.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/concurrentspin2.csproj b/src/coreclr/tests/src/GC/Stress/Tests/concurrentspin2.csproj
index 1b731e5d81e2f..80c89d137c559 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/concurrentspin2.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/concurrentspin2.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/doubLinkStay.csproj b/src/coreclr/tests/src/GC/Stress/Tests/doubLinkStay.csproj
index 528e03789ac0e..98b0659466592 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/doubLinkStay.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/doubLinkStay.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/pinstress.csproj b/src/coreclr/tests/src/GC/Stress/Tests/pinstress.csproj
index 291578309f9d8..3f8eddfc0fcfd 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/pinstress.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/pinstress.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/GC/Stress/Tests/plug.csproj b/src/coreclr/tests/src/GC/Stress/Tests/plug.csproj
index 06ae93419feeb..725dfa6ef4129 100644
--- a/src/coreclr/tests/src/GC/Stress/Tests/plug.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/plug.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
index feff7f97065ab..7384cdd21c409 100644
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
index 63231a1a9faad..12afda608fcb7 100644
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MarshalArrayByValTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj
index ac35c0f223b62..484fdcef17078 100644
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj b/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
index 0812221e328d7..c96591a1226dc 100755
--- a/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
+++ b/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
index f822999bbe8c7..157be61d17bfa 100644
--- a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
+++ b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj b/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
index b81fa6566da5f..710b722257a32 100644
--- a/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
+++ b/src/coreclr/tests/src/Interop/DllImportAttribute/DllImportPath/DllImportPathTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- The test cannot be run twice in the same process since it moves a native dll that it uses for pinvoke later -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj b/src/coreclr/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj
index 2a6777073cc94..a8072592722b5 100644
--- a/src/coreclr/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj
+++ b/src/coreclr/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDom.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Interop.settings.targets))" />
diff --git a/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj b/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
+++ b/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/ICastable/Castable.csproj b/src/coreclr/tests/src/Interop/ICastable/Castable.csproj
index 407d5f92a0b69..85da16f892d97 100644
--- a/src/coreclr/tests/src/Interop/ICastable/Castable.csproj
+++ b/src/coreclr/tests/src/Interop/ICastable/Castable.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj b/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj
index 71c8569f55209..20e6a3fc425e8 100644
--- a/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj
+++ b/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj b/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
index 499a62401457b..0ccabcafe1255 100644
--- a/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
+++ b/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
index 3dd2b0b9d9812..4acd106109c16 100644
--- a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
+++ b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj
index f819455dcb40d..a19962a5b48f4 100644
--- a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj
+++ b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj b/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
index 12db6e537b82a..07747843c6781 100644
--- a/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
+++ b/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsByValArray/AsByValArrayTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsByValArray/AsByValArrayTest.csproj
index 6750378663d2e..63509cde44689 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsByValArray/AsByValArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsByValArray/AsByValArrayTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsLPArray/AsLPArrayTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsLPArray/AsLPArrayTest.csproj
index 6750378663d2e..63509cde44689 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsLPArray/AsLPArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsField/AsLPArray/AsLPArrayTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsDefault/AsDefaultTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsDefault/AsDefaultTest.csproj
index 6750378663d2e..63509cde44689 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsDefault/AsDefaultTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsDefault/AsDefaultTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsLPArray/AsLPArrayTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsLPArray/AsLPArrayTest.csproj
index 6750378663d2e..63509cde44689 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsLPArray/AsLPArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Array/MarshalArrayAsParam/AsLPArray/AsLPArrayTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj
index 0dbf574e8efcf..27804eb7023f8 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj
@@ -2,7 +2,6 @@
   <Import Project="../../Interop.settings.targets" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/AsAny/AsAnyTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/AsAny/AsAnyTest.csproj
index 9e0a3472c44b6..4693a29059afe 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/AsAny/AsAnyTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/AsAny/AsAnyTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFF/AFF_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFF/AFF_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFF/AFF_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFF/AFF_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFT/AFF_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFT/AFF_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFT/AFF_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PFT/AFF_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTF/AFF_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTF/AFF_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTF/AFF_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTF/AFF_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTT/AFF_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTT/AFF_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTT/AFF_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFF_PTT/AFF_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFF/AFT_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFF/AFT_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFF/AFT_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFF/AFT_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFT/AFT_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFT/AFT_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFT/AFT_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PFT/AFT_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTF/AFT_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTF/AFT_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTF/AFT_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTF/AFT_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTT/AFT_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTT/AFT_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTT/AFT_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/AFT_PTT/AFT_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFF/ATF_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFF/ATF_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFF/ATF_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFF/ATF_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFT/ATF_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFT/ATF_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFT/ATF_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PFT/ATF_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTF/ATF_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTF/ATF_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTF/ATF_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTF/ATF_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTT/ATF_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTT/ATF_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTT/ATF_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATF_PTT/ATF_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFF/ATT_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFF/ATT_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFF/ATT_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFF/ATT_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFT/ATT_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFT/ATT_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFT/ATT_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PFT/ATT_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTF/ATT_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTF/ATT_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTF/ATT_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTF/ATT_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTT/ATT_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTT/ATT_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTT/ATT_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/ATT_PTT/ATT_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_False/Assembly_False_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_False/Assembly_False_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_False/Assembly_False_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_False/Assembly_False_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_True/Assembly_False_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_True/Assembly_False_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_True/Assembly_False_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_False_True/Assembly_False_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_False/Assembly_True_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_False/Assembly_True_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_False/Assembly_True_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_False/Assembly_True_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_True/Assembly_True_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_True/Assembly_True_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_True/Assembly_True_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Assembly_True_True/Assembly_True_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_False/Pinvoke_False_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_False/Pinvoke_False_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_False/Pinvoke_False_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_False/Pinvoke_False_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_True/Pinvoke_False_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_True/Pinvoke_False_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_True/Pinvoke_False_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_False_True/Pinvoke_False_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_False/Pinvoke_True_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_False/Pinvoke_True_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_False/Pinvoke_True_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_False/Pinvoke_True_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_True/Pinvoke_True_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_True/Pinvoke_True_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_True/Pinvoke_True_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/Char/Pinvoke_True_True/Pinvoke_True_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFF/AFF_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFF/AFF_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFF/AFF_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFF/AFF_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFT/AFF_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFT/AFF_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFT/AFF_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PFT/AFF_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTF/AFF_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTF/AFF_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTF/AFF_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTF/AFF_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTT/AFF_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTT/AFF_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTT/AFF_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFF_PTT/AFF_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFF/AFT_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFF/AFT_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFF/AFT_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFF/AFT_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFT/AFT_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFT/AFT_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFT/AFT_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PFT/AFT_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTF/AFT_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTF/AFT_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTF/AFT_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTF/AFT_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTT/AFT_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTT/AFT_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTT/AFT_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/AFT_PTT/AFT_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFF/ATF_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFF/ATF_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFF/ATF_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFF/ATF_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFT/ATF_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFT/ATF_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFT/ATF_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PFT/ATF_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTF/ATF_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTF/ATF_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTF/ATF_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTF/ATF_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTT/ATF_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTT/ATF_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTT/ATF_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATF_PTT/ATF_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFF/ATT_PFF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFF/ATT_PFF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFF/ATT_PFF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFF/ATT_PFF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFT/ATT_PFT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFT/ATT_PFT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFT/ATT_PFT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PFT/ATT_PFT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTF/ATT_PTF.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTF/ATT_PTF.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTF/ATT_PTF.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTF/ATT_PTF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTT/ATT_PTT.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTT/ATT_PTT.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTT/ATT_PTT.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/ATT_PTT/ATT_PTT.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_False/Assembly_False_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_False/Assembly_False_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_False/Assembly_False_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_False/Assembly_False_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_True/Assembly_False_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_True/Assembly_False_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_True/Assembly_False_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_False_True/Assembly_False_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_False/Assembly_True_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_False/Assembly_True_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_False/Assembly_True_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_False/Assembly_True_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_True/Assembly_True_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_True/Assembly_True_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_True/Assembly_True_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Assembly_True_True/Assembly_True_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_False/Pinvoke_False_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_False/Pinvoke_False_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_False/Pinvoke_False_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_False/Pinvoke_False_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_True/Pinvoke_False_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_True/Pinvoke_False_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_True/Pinvoke_False_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_False_True/Pinvoke_False_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_False/Pinvoke_True_False.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_False/Pinvoke_True_False.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_False/Pinvoke_True_False.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_False/Pinvoke_True_False.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_True/Pinvoke_True_True.csproj b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_True/Pinvoke_True_True.csproj
index 67b7632171747..85194a0fc4530 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_True/Pinvoke_True_True.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/BestFitMapping/LPStr/Pinvoke_True_True/Pinvoke_True_True.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ArrayTest/ArrayTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ArrayTest/ArrayTest.csproj
index 7eb7690b4db55..5a6c1e7866438 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ArrayTest/ArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ArrayTest/ArrayTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ReverseTest/ReverseTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ReverseTest/ReverseTest.csproj
index 7eb7690b4db55..5a6c1e7866438 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ReverseTest/ReverseTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/ReverseTest/ReverseTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/StructTest/StructTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/StructTest/StructTest.csproj
index 7eb7690b4db55..5a6c1e7866438 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/StructTest/StructTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/StructTest/StructTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/Test/Test.csproj b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/Test/Test.csproj
index 7eb7690b4db55..5a6c1e7866438 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/Test/Test.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/CriticalHandles/Test/Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/CustomMarshalers/CustomMarshalersTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/CustomMarshalers/CustomMarshalersTest.csproj
index 68771687657f3..d777b550e6ba3 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/CustomMarshalers/CustomMarshalersTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/CustomMarshalers/CustomMarshalersTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
     <!-- CustomMarshalers unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/DateTime/DateTimeTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/DateTime/DateTimeTest.csproj
index e785b860aca75..2efdbcfa3ed01 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/DateTime/DateTimeTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/DateTime/DateTimeTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DateTimeTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Decimal/DecimalTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Decimal/DecimalTest.csproj
index 346928d111e11..c6b2767243b33 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Decimal/DecimalTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Decimal/DecimalTest.csproj
@@ -2,7 +2,6 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Interop.settings.targets))" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Delegate/DelegateTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Delegate/DelegateTest.csproj
index 9e0a3472c44b6..4693a29059afe 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Delegate/DelegateTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Delegate/DelegateTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Generics/GenericsTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Generics/GenericsTest.csproj
index 588b6faf36232..4804c5c51ffe6 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Generics/GenericsTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Generics/GenericsTest.csproj
@@ -4,7 +4,6 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/IEnumerator/IEnumeratorTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/IEnumerator/IEnumeratorTest.csproj
index 113e3e8a04e3d..b301ee59c1ab3 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/IEnumerator/IEnumeratorTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/IEnumerator/IEnumeratorTest.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- IEnumerator/IEnumerable marshalling unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/HandleRef/HandleRefTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/HandleRef/HandleRefTest.csproj
index 31fd54501b977..3cd3b370b11b0 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/HandleRef/HandleRefTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/HandleRef/HandleRefTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/MAWSPITest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/MAWSPITest.csproj
index 9d49ec2d3d12a..f09c55df6210f 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/MAWSPITest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/MAWSPITest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MAWSPITest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll1/ManagedDll1.csproj b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll1/ManagedDll1.csproj
index 81abc6308cfe3..e28377ad0818d 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll1/ManagedDll1.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll1/ManagedDll1.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll2/ManagedDll2.csproj b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll2/ManagedDll2.csproj
index 81abc6308cfe3..e28377ad0818d 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll2/ManagedDll2.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/ManagedDll2/ManagedDll2.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/ThisCall/ThisCallTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/ThisCall/ThisCallTest.csproj
index cc1509e374ece..36226a70a490d 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/ThisCall/ThisCallTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Miscellaneous/ThisCall/ThisCallTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyTrue/AssemblyTrueTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyTrue/AssemblyTrueTest.csproj
index e959a7116401a..87e2dfd10cbf2 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyTrue/AssemblyTrueTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyTrue/AssemblyTrueTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyWithoutComVisible/AssemblyWithoutComVisibleTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyWithoutComVisible/AssemblyWithoutComVisibleTest.csproj
index c40bdd0791913..46236f597daf6 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyWithoutComVisible/AssemblyWithoutComVisibleTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/AssemblyWithoutComVisible/AssemblyWithoutComVisibleTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTest.csproj
index cd98e8ea3a2eb..a603a3d395cd3 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTestInALC.csproj b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTestInALC.csproj
index e9676e2ffe2b7..b06d565946cae 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTestInALC.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/NativeCallManagedComVisible/Default/DefaultTestInALC.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Primitives/Int/PInvokeIntTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Primitives/Int/PInvokeIntTest.csproj
index bc2fd8c769310..d7a3bb0f1935c 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Primitives/Int/PInvokeIntTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Primitives/Int/PInvokeIntTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PInvokeIntTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Primitives/Pointer/PInvokePointerTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Primitives/Pointer/PInvokePointerTest.csproj
index 5bab1ec9f38bd..5afd15be91313 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Primitives/Pointer/PInvokePointerTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Primitives/Pointer/PInvokePointerTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Primitives/RuntimeHandles/RuntimeHandlesTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Primitives/RuntimeHandles/RuntimeHandlesTest.csproj
index c3cdd005b5e14..ac56e2d970200 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Primitives/RuntimeHandles/RuntimeHandlesTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Primitives/RuntimeHandles/RuntimeHandlesTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="RuntimeHandlesTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/SafeHandles/SafeHandleTests.csproj b/src/coreclr/tests/src/Interop/PInvoke/SafeHandles/SafeHandleTests.csproj
index 9e0a3472c44b6..4693a29059afe 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/SafeHandles/SafeHandleTests.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/SafeHandles/SafeHandleTests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/Invalid/InvalidParamIndex.csproj b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/Invalid/InvalidParamIndex.csproj
index 1bab965da4b31..c438f9f93d790 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/Invalid/InvalidParamIndex.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/Invalid/InvalidParamIndex.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="InvalidParamIndex.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/PassingByOutTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/PassingByOutTest.csproj
index 63476033ca996..93cbfdee2f6e6 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/PassingByOutTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/PassingByOutTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PassingByOutTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/PassingByRefTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/PassingByRefTest.csproj
index 646a3d2107d72..e248fc4583ca8 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/PassingByRefTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/PassingByRefTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PassingByRefTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/PassingByOutTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/PassingByOutTest.csproj
index 63476033ca996..93cbfdee2f6e6 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/PassingByOutTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/PassingByOutTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PassingByOutTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/PassingByRefTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/PassingByRefTest.csproj
index 646a3d2107d72..e248fc4583ca8 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/PassingByRefTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/PassingByRefTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="PassingByRefTest.cs" />
diff --git a/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj
index ed46d5535cd68..83a92b1560e0c 100644
--- a/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Varargs/ArgIterator marshalling unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
index 30ea67b881f3b..2b32bffd28394 100644
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj b/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj b/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj
+++ b/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj b/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
+++ b/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj b/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj
index 941aca5560883..c3fdd31d16404 100644
--- a/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj
+++ b/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj
index f2bc2c83ed9de..05d8826069558 100644
--- a/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;ANSIBSTR</DefineConstants>
+    <DefineConstants>$(DefineConstants);ANSIBSTR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj
index fb38f706b8cfe..83be73db80c98 100644
--- a/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;BSTR</DefineConstants>
+    <DefineConstants>$(DefineConstants);BSTR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
index bd4f958f4df4f..98bd9782a10a3 100644
--- a/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;LPSTR</DefineConstants>
+    <DefineConstants>$(DefineConstants);LPSTR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="*.cs" />
diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
index c49f44647acee..8fa3f4fe0bdd6 100644
--- a/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC;LPTSTR</DefineConstants>
+    <DefineConstants>$(DefineConstants);LPTSTR</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
index 0812221e328d7..c96591a1226dc 100644
--- a/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/VBByRefStr/VBByRefStrTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/VBByRefStr/VBByRefStrTest.csproj
index 117e26227e611..796bf5b04cab1 100644
--- a/src/coreclr/tests/src/Interop/StringMarshalling/VBByRefStr/VBByRefStrTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/VBByRefStr/VBByRefStrTest.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
index 97e118174174e..9cf85a88ac294 100644
--- a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
index c2adbd3bad8c6..235bdd745523a 100644
--- a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="MarshalStructAsLayoutSeq.cs" />
diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/DelegatePInvoke/DelegatePInvokeTest.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/DelegatePInvoke/DelegatePInvokeTest.csproj
index bb597dea7fe3b..8fc0da2162d93 100644
--- a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/DelegatePInvoke/DelegatePInvokeTest.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/DelegatePInvoke/DelegatePInvokeTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ReversePInvokeManaged/ReversePInvokeTest.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ReversePInvokeManaged/ReversePInvokeTest.csproj
index 69f81223a8fdb..4f13c0b1c5a51 100644
--- a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ReversePInvokeManaged/ReversePInvokeTest.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ReversePInvokeManaged/ReversePInvokeTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/DelegatePInvoke/DelegatePInvokeTest.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/DelegatePInvoke/DelegatePInvokeTest.csproj
index 9ac0ce07644b9..7c65ceabcae46 100644
--- a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/DelegatePInvoke/DelegatePInvokeTest.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/DelegatePInvoke/DelegatePInvokeTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/ReversePInvoke/ReversePInvokeTest.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/ReversePInvoke/ReversePInvokeTest.csproj
index 621dd4536c7e4..a1db4da663a41 100644
--- a/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/ReversePInvoke/ReversePInvokeTest.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/ReversePInvoke/ReversePInvokeTest.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/Misc/Concat/ConcatTest.csproj b/src/coreclr/tests/src/JIT/Directed/Misc/Concat/ConcatTest.csproj
index f8b1409682e5f..4075ae90a4d1c 100644
--- a/src/coreclr/tests/src/JIT/Directed/Misc/Concat/ConcatTest.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Misc/Concat/ConcatTest.csproj
@@ -5,10 +5,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ConcatTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj b/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
index 397ad934ba4f0..bdac40ad1e45a 100644
--- a/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
@@ -4,10 +4,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="gettypetypeofmatrix.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
index 0653e7ea1e6c1..fe4a2822d7cab 100644
--- a/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj b/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
index e2ef8ac548c14..440e57beac9ae 100644
--- a/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="LargeNumberOfArgs.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj b/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
index 2eb18fd46315a..9db8c85c2e321 100644
--- a/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NoMetaData.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj b/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj
index 98c53b4c0150b..97ccf76701d67 100644
--- a/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Recursion.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
index bec9803c90143..3ce7e88f88ad5 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="constructor.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
index f9c78b020d4b2..f60c9a6664874 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="constructor.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
index 6a497910928c1..cdfeb2ac942d6 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="constructor.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
index be287cef74ca4..007389c2667b9 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="constructor.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
index 15943e0ee6a34..5d79828e64efb 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hashcode.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
index 2625bf966533d..f0165e735a52a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hashcode.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
index f275d9c72f99a..ca7652cede4bb 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hashcode.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
index d888b43daec59..dd66daa4edc21 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hashcode.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
index 02ac3b0974290..8629cdf281d15 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hasvalue.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
index 4003cc5bce432..1fd3644afee36 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hasvalue.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
index 0ece2b7ed72dd..acc1d7fa3d206 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hasvalue.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
index 74f3cb75cc786..40791239d2da9 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hasvalue.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
index e521d3b6c22ff..86af0c0a15bda 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="invocation.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
index 406d945cc646e..2bb0036ef9d48 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="invocation.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
index c086638d661b8..b0cfe5f63d452 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="invocation.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
index 9914ee722b461..9ab3e5b65463d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="invocation.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
index 4b17339d53e16..ef877a15c74ce 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="tostring.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
index 3764d5abefacd..aa1e67040eec7 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="tostring.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
index 4ea244c8092d1..17f76b2af85be 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="tostring.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
index 78cf963ef81fe..ef1647f78cc50 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="tostring.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
index 08a9e62d27197..c0650ff237457 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="unboxnullable.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
index 41a7bb1079644..ac44b38a13bf0 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="unboxnullable.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
index dc66c358dd626..0b3805a811890 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="unboxnullable.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
index 9192f86b739b1..ff0c147ac9d7b 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="unboxnullable.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj
index dd8d18e2cf12d..d348b684c9eeb 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="value.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj
index 75ec372dffe60..0261dbe92cd2c 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="value.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj
index dcf85d5c4e1b7..99cf7ce6ae94d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="value.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
index b65e057becfa6..c42a7f892be30 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="value.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
index fa03ccb024e52..9ec7a9a2e7a21 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CCSE.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
index 4047a91cbc8e3..054e855290c70 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CCSE.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
index 5867266171c60..e39c17393ff0a 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CCSE.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
index 0ee5ccc448827..d8140fc007cde 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CCSE.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
index 8cb1b465c4a2a..c8970628e885e 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
index c25b27b902f2e..80c3f596065a9 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
index faaeb317a49ef..4f40180098e56 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
index 11bc655a2ad7e..4fea337956ab2 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
index 76d7cab9302fc..d5a38763dc1a5 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
index 8afb43cf4596d..251907cace64a 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
index 39988febdefbf..aeb65b1933f67 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
index cbdbe8f78ecb9..9502f9ebbd922 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
index 2f71f5f7b4e09..01e923f279a8c 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
index 7dcf9b68cfe97..cbe12116ef939 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
@@ -6,11 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
index 74238cedd05c7..15e25ea12263d 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
index a132a504df308..9c1cd4f632c05 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
@@ -6,11 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
index b91eb37136f4f..47e5bd2be4681 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
index d148cbe4ba3fc..6e778ccbd9f6e 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
index df9e2cec711dd..c0539504f3f3d 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
index c3c57ff712605..de22c7242202b 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
index a0063ffc04308..44ee45e34b2ea 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
@@ -9,7 +9,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="getclassfrommethodparam.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
index af633459b7937..7ad232f7846dc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="instance.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
index 3ef0f62bbd62d..4e8c25651e8dc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="instance.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
index 6b885511337ea..3d70d5b2454f8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="instance.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
index 090c367f50265..c1ffaf4d6536a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="instance.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
index 547523aa4fb0e..e7698a6781691 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="fibo.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
index 2f4ad6f16962c..3290817171514 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
index 6a192b19137b1..b92846cfe2211 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="fibo.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
index 4b0899e0d8d35..5ec20697309a8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
index e1a676ed13bff..0f0a5905273c5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="fibo.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
index e1657c7d9b554..6fee27543cb9f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
index 0dab648837e3c..9c8213593ba2c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="fibo.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
index 8b322a7bcbb59..972dd5229e84f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
index 86496fdf70d45..5c6a20156639a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
index fb32dfbb355b4..5ba6965ad8a3c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
index 62334d525043d..20e19140a2543 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
index 8b322a7bcbb59..972dd5229e84f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sin.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj
index 9f08cd7adf6de..b49291420fd12 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>None</DebugType>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
index 39216471ce4f1..fab1f2ccfcacf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="try.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
index ae36560a6539f..f0f2c693cfcdd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="try.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
index 91cdbcd36824a..7473b90f41b1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="try.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
index d9bc772382c12..fb0fa65986e78 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="try.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
index bd23fa5a11c8b..f8a97e902c2ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
index 89c1839588d3f..bd190373e60d7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
index 91d72cf8197d9..2f787e951a05b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
index 0bcd71d4035e4..ae6de6916b3a1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
index 4910b67b5185e..657c13dd92921 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="intrinsic.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
index a4c6e96eca057..1450c76598641 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="intrinsic.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
index 5dd4d5d6a8492..482c5c271b4c3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="intrinsic.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
index 55430e4eb4ea6..869df5d057b87 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="intrinsic.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/src/coreclr/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
index ccd9a9fb01c17..8741e582e6ed4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
index dfa236b0a91be..70b479eeda29a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
index 862ab2eb53af9..00b9310390c9f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
index a67dd8bb5dd92..8003fc0302570 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
index a5cc983fede88..850891219cda6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
index 1ea8ea8ecdda5..68080f691e66e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
index 4a374e895a47d..325e3df3952f4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
index 93484a30136b9..0272781d4a7b6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
index 84ccccab8bfe6..2d8711a0d8f47 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
index 111874c67e109..8c6c2b2e6add2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
index 20fc8cc324d78..c8235407417f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
@@ -8,7 +8,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
index bc88a0fdd2e52..7fedd976509e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
index 1efb7ae498b78..6dcb8d992909d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
index 790f28482c584..09e048ef17efd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="throw.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
index 97bca755de9ed..d22f37bc8ce1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="throw.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
index 23c2a8f0307b0..19e69e3815dab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType />
     <Optimize />
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="throw.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
index 362fee43b2b67..1b99a315dfca3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType />
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="throw.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
index e63d9489506cd..bf56081b5aa48 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="loopstrswitchgoto.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
index e16520671feec..66ea96d71f2f9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="loopstrswitchgoto.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
index 050aa61b5a6fb..2d1d42fc5dba8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="loopstrswitchgoto.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
index 3b55b107d4873..057a432902ce3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="loopstrswitchgoto.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
index 450b9f20bfa32..861379bcfadb5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="strswitchfinal.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
index 2de312ca0b495..813e47519160e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="strswitchfinal.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
index 8ac783d50e912..cd9efb86f934a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="strswitchfinal.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
index 6b3dd5b157295..dd0f3a136f1ff 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
@@ -6,7 +6,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="strswitchfinal.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
index f19d68a34649e..773fd8863f9d5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
index c794f6cf115a3..a8ce62f999875 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
index edf4fceef0abb..043d9dd53b967 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
index 7b3734a3475ed..ed84e2b7f96cd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
index 4d3365a09c2f5..8d2c509d3af73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
index 5de12de95cd1a..2b1a8100ae680 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
index b0ca58a714c12..b52da6d5bdc6e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
index be056dbd4fdb4..5cb8cab320562 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
index 06d646b96441e..acfdc6d837fad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="3w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
index 5f2e579ad3245..621036acfe912 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
index fbfbd2193fec6..69ed6dcbecede 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
index 564e13322a616..e6980688391de 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
index 9c4ca26ea6b37..4d747b51106f6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-01.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
index 607c720d4ef33..045584af594f2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
index 9eb71e7d8f932..77ecbd4055e42 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
index d4c0d31f96eed..d3ca7a80b2e78 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
index 3c4b9b5bea3dc..c89df4f3edb51 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-02.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
index 8f4aa02f5690e..d76461d9e35da 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-03.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
index d1dd60bd00f1a..4018e13c339c1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-03.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
index e3c6418ac3f10..825f538235c80 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-03.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
index 3a54bcf491d26..c0168fa00f943 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-03.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
index 2852facd05d95..960a367c8e202 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-04.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
index 8b8be799799db..3aa84696a48b2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-04.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
index 1280e4083e0a7..f19b5452aa288 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-04.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
index 8aebafeb75415..34d3179b30ade 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-04.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
index b7b2e8c9a66fc..19cf8aaa785c7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-06.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
index 05231865287d9..53049cc7f1ef7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-06.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
index 362f139524a9d..83f05cfcbfc07 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-06.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
index 114d3811bc8b8..e4311c6b03d21 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="5w1d-06.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj b/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
index a84edbb158952..8a4c0cee39e78 100644
--- a/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="bug603649.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj b/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
index 511a8e34371a4..692ad1df98a94 100644
--- a/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
index 33efc7ea19f69..5d0fdf0d3383b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="b207621.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
index 5eaf67c11f40c..e00bfce640be8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="test1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
index afbcb92f918df..bad3f1daaf950 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="test2.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
index 9eab09195de60..187ebcb849a9e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="test4.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
index e7ca779e0ec36..9af49846bebab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
index a773d9abcd9c0..f2d11cbbb0494 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof32.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
index 6be96d0483fd0..d91c59a063845 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
@@ -6,11 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof64.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
index b865687aec278..8d1bea7449c8c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
index b375f51e156fc..196451e076fc1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof32.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
index ca76d8f9811b3..fc2f49d28208d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
@@ -6,11 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof64.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
index 102480f1e9945..ea29ae05ebf09 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
index acb1a7fe4e32b..cd99139e9fea6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof32.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
index dba99c714d153..82757175a68ae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof64.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
index 650facf4e7153..7d6b0e1b39832 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
index 39ea821b4ebc8..eefb1f88cd17d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof32.cs" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
index fa3c2bc8177a3..ce11cb9c38749 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
@@ -7,11 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof64.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
index 8ccced4c67dbc..2cd7f17dfab4f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
@@ -5,10 +5,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
index 74247f1dbcac6..2a2a4746324b2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
index ef5e22bf014fc..06d5f61c8911a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
     <CLRTestExitCode>0</CLRTestExitCode>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
index 6ffe30280232f..13535e4d4ca90 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
index 8ccced4c67dbc..2cd7f17dfab4f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
@@ -5,10 +5,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
index 06c2a30146484..0bd7ee83d3bcb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="b43313.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
index 807aaaf3b1fae..2fd676eb899fc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType />
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
index 579c0627d7589..e518e24b4810e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="b55197.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
index 8ccced4c67dbc..2cd7f17dfab4f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
@@ -5,10 +5,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
index 724c5121bfb5c..b87de28641d1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
index 7aecee33276db..9ac889091adef 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
@@ -6,13 +6,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
index 7debdfb6aa383..1d9a13f5f1d49 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="csharptester.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
index 4c8062e1d9547..6724bd6b47b91 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="pState.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
index 8d9182db227b9..0763a13f405e2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
index 03df04996625e..8ddfebfb93364 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cs1.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
index bdb98a38c6625..77f81883ea388 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <DefineConstants>$(DefineConstants);_65536</DefineConstants>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
index 9612d8e337c56..50e9e8e4c8474 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;_65535</DefineConstants>
+    <DefineConstants>$(DefineConstants);_65535</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Repro.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
index b4a4a70eeedb3..ba46b8f2c5061 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
index 3829a584040f8..074ba7bac118f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
@@ -5,10 +5,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType />
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
index 2ac0478d80e7c..23d62c2a70021 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
index bf476762edada..242109d8b763f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
index b4a4a70eeedb3..ba46b8f2c5061 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
index dd1760816fd11..1c752e0b73081 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
index b7428dff579e3..b6111a079452b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
@@ -7,9 +7,7 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
index b4a4a70eeedb3..ba46b8f2c5061 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
index 2886a3b398003..2df3984255ce4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DDB188478.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
index 79da9080b4061..aa62ff8dc842d 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
index e9299a0ff3e3e..f7d2569b05441 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn),8002</NoWarn>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
index 3835b24dfab8e..ec67251f58ba7 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
index f1f3d7db9b3cc..93c0dd739e22c 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="simple.cs" />
diff --git a/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
index 6ffe30280232f..13535e4d4ca90 100644
--- a/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj b/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
index 60987ea84ef23..cab0a418443f4 100644
--- a/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="repro52.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
index 75512fcc09c5a..29d0c8172f8a8 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
index 9694aac61b552..e7a55b0362f12 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
index 4eb59552dd0d9..d336b0dd95d88 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
index ad3e5fca320e9..69050653b5bdf 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
index dfdfe772480ec..662ef44f2f5aa 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
index 576843ccc3ab3..1d4f20e53b36e 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
index 63f997c2408f5..e5d175807ecdb 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
index 7361d42cf3833..60c79084fdc21 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
index 0132859d395f7..0c85d7a517fe6 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
index 93c4edc5f9d66..65c15005d68be 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
index e73605b1edaf1..c422591caa86e 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
index 5dfb944d7c4f6..337954b249dd4 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
index f87811962b46e..d448134f25a96 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
index 12a926bf68018..0cef572bcda42 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
index 315ef228fbb87..034842f6b6627 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
index 8b6cb451ec189..4a22304226443 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
index e23a75a1dd6cd..859b0583713f5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
index bc42606407fb6..34dedae9afbf2 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
index a4872a15b8553..e4adf46c4c3a1 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
index 4f6202c8328e4..be58bd254771d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
index 0127bd978f071..002db37fbbf4f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
index 68d416a93597a..da32e95c8e419 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
index d8483671d88e8..56745c58efef6 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
index 714ab4fda7bd5..60b28ffa2e7bd 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
index 5d02dd1470060..4a30f0df2766d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
index 7781bfd5e4788..6010584ea4116 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
index ff169473774ad..ea1a01e44bb64 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
index a39424d3eb396..c29ff5592faee 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
index fb36592c729ce..cc8aabc647c9d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
index c68286bf16c57..24aad1c6e3b18 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
index 2bdb84f4f3082..98806108e86f8 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>full</DebugType>
-    <NoLogo>True</NoLogo>
     <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
index 70bffaf8bf3c7..6c90acd4709e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
index 82a905a1845ff..c436fe588a060 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_DYNAMIC</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
index 812781e3f338a..d6b19431606e4 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_LARGE</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
index 0fb761faf48a1..0d9ccd68eb799 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
index 1cdd4f5486251..218613f7ab713 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_DYNAMIC</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
index 5d49a56ffbbe5..ceb92b78ecb7f 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_LARGE</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
index 497b38f6e3518..29fdce2d53909 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_dynamic.csproj
index 353dde8e3cc2f..f22da2eead178 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_DYNAMIC</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_large.csproj
index 1356739d0cc31..e228c6496be82 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_LARGE</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_small.csproj
index c49d328193d2c..834f3dfa77b2e 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh05_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
index 467853bd251a0..4af966a1e3948 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
index 467853bd251a0..4af966a1e3948 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
index 467853bd251a0..4af966a1e3948 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
index 5df562b938b08..1b6c2bd504266 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_DYNAMIC</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
index 1127f1b212c40..a9413720a5631 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_LARGE</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
index adea0d089cfff..c44c9607a0a6f 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
index 60735fc86ae0c..c5f482fd6e6a6 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_DYNAMIC</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
index 3af3483eff5d2..57bfbf4e55f32 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_LARGE</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
index 82e7fa58f277f..9d53cd1ca260e 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
index c61f62264d77c..72b9c010980fd 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_DYNAMIC</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
index de10280c20ef6..192410eac7fdb 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_LARGE</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
index a074362a57c81..a8da8d06a22d5 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);LOCALLOC_SMALL</DefineConstants>
     <NoWarn>$(NoWarn),8002</NoWarn>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
index 8977e8bb235da..a8d2435a8ccba 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cprop001.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
index 570036a153539..be7df7c9f6e07 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cprop001.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
index e595f9256f60b..66074ce3daa18 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cprop001.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
index 6e001fdbd22d2..cc55fa45f411a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="cprop001.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
index 6415cf5aad782..9ceb1beeda468 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_ADD</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_ADD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
index 95ab541254ca5..f907d93f13bcf 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_AND</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_AND</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
index a77f7914b10d1..8f763a64b16ea 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_DIV</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_DIV</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
index b41c67b6df746..d5dcea7affff4 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_MOD</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_MOD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
index 5482d2b9e2ac1..ee01f7bc31af6 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_MUL</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_MUL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
index 6cef72560d94f..06b1d74945cb1 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_OR</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_OR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
index 2f2a195e5ea0d..8fa7a92abb385 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_SHR</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_SHR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
index 7c28f80b6a58f..ccf8ddd85db33 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_SUB</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_SUB</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
index 5bb4513c03be4..1ae8db2b708c4 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
@@ -6,10 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_XOR</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_XOR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="VolatileTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
index 3b12db01f6645..c7981d517f829 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arrayexpr2.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
index bdeb4c9c6739b..3e50bb20ab626 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arrayexpr2.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
index cd324518f892e..1190f1a0868aa 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arrayexpr2.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
index afc6c04853f04..56e3946a7e53c 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arrayexpr2.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
index 237fd4cb18bc7..38f61ce5d4010 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arrayexpr2.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
index 2f390399c9cf2..49f2b770e6454 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixedexpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
index f2cf513989b0a..f170eb942c138 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
index ff21154459c9f..2483e224005bd 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixedexpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
index 4e55c4c1d74e8..4a1a565cfa3f3 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixedexpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
index db40a51c8e6e8..c4e98e1031bb4 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixedexpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
index c78ae3b9a5700..04aac55b82720 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="simpleexpr4.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
index 6d1c63934559e..8c21543b1dc29 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="simpleexpr4.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
index 3df2a17796da7..be4dbb16bbf9b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="simpleexpr4.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
index 081cd34d3de0b..a9584d328d98d 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="simpleexpr4.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
index d51ea9df17081..310c606b8bcc1 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
@@ -6,10 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="simpleexpr4.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
index 34cccc99eaae8..cba95157bef55 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
index 9e0eadf71584a..9e4429316e7f0 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
index ba232dfc26691..f27a45d436971 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
index ea1233b3a2b12..18ba2adce7380 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
index 221c2f34d141c..c6d3cb3362f8b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
@@ -7,10 +7,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExpr1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
index 4eaad2958add7..1f193e5c8915b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
@@ -6,10 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExprUnchecked1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
index 312e3937d5503..fabe19e1b10a2 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
@@ -6,10 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExprUnchecked1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
index 8586ee5016c69..33389c3027946 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
@@ -6,10 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP;TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExprUnchecked1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
index bad0ab46676ef..ebf33b1b89bae 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
@@ -6,10 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;TRY</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExprUnchecked1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
index 9a2dfdcbaebba..c79fcecfebafe 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
@@ -6,10 +6,9 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;LOOP</DefineConstants>
+    <DefineConstants>$(DefineConstants);LOOP</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="staticFieldExprUnchecked1.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
index afbe4144f740f..c6cb276940301 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
@@ -8,10 +8,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrayWithThread.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
index e00a759d9c5c9..e7c7ec8648b55 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="opadd.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
index 414d95c3cd6c7..bc2f4df5d2703 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="opmul.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
index 0df16b1a656b7..80d9b0f2ad32a 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
@@ -6,11 +6,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="opsub.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
index 35d543a0ae58f..fab84f019e932 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="use.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
index 2684dec1d4903..13abc20dc1122 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_ADD</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_ADD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow01.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
index 4477dfd349352..d98ff356c7edb 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_DIV</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_DIV</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow01.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
index fd8b17dddeaf0..8c8b60b9ef667 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_MUL</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_MUL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow01.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
index fa5634d132c89..d82f88ffc5a66 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_SUB</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_SUB</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow01.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
index 6e4aedb3e66d5..e2ec4f9099e14 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_ADD</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_ADD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow02.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
index 2d58af890d4d5..38015d0ab62c6 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_DIV</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_DIV</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow02.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
index 8ac49bcb0c512..314b31bc3a8fc 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_MUL</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_MUL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow02.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
index e78e6d8005a23..9dcf44a6aa0da 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_SUB</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_SUB</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow02.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
index 3ea4a4f34abb0..3a6bd2385cf59 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_ADD</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_ADD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow03.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
index a6b909b258e3e..eccc4fcf4461a 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_DIV</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_DIV</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow03.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
index a1af7228dc3e4..16a8d95e2c212 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_MUL</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_MUL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow03.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
index 9d286ce2c41e7..6554b2b56278b 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_SUB</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_SUB</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow03.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
index 4c8adfacb6991..92a71101fa6da 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_ADD</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_ADD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow04.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
index f77b0e31ee9a8..6892331c8c936 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_DIV</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_DIV</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow04.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
index 501d1ebfb4c04..6cabb620a8474 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_MUL</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_MUL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow04.cs" />
diff --git a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
index 0d1a3025d72ba..32d613c2309a0 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
@@ -5,10 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR;OP_SUB</DefineConstants>
+    <DefineConstants>$(DefineConstants);OP_SUB</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="overflow04.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
index 5d9bb065aae0a..bac43c81f412a 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrBoundUnsigned.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
index 660c6e1d7b140..300e42f4729c3 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ConstantProp.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
index 74df190b08b51..9fa9b23450f01 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CopyProp.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
index 4adc057bf4a05..4fdc3210608bc 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion1.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
index 59115512ba92e..3064fc126a30e 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion2.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
index 54d57db73730b..62012a33740b6 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion3.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
index 71d10e82771a6..7225cdb7e61d0 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion4.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
index 09898b7b9ffe4..5a28c3111f2d6 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion5.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
index 41f4d56221017..b84eb65b020f1 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion6.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
index 45cbd0226323d..4b17e37ba9c0a 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="NullCheckAssertion7.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
index 31e97b109df12..c1092420f2ac0 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="TypeOfAssertion.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
index bf476762edada..242109d8b763f 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
index 7b7de6ecb0152..40e94c4d7ee6b 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/opt/Devirtualization/override.ilproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/override.ilproj
index 789d232e52f56..8e31850ce765e 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/override.ilproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/override.ilproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallCandidates.csproj b/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallCandidates.csproj
index 6c9c20406d2a5..3492b9aaa0f9e 100644
--- a/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallCandidates.csproj
+++ b/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallCandidates.csproj
@@ -6,13 +6,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FastTailCallCandidates.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallInlining.csproj b/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallInlining.csproj
index 4db306103db7e..c2261eb29e153 100644
--- a/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallInlining.csproj
+++ b/src/coreclr/tests/src/JIT/opt/FastTailCall/FastTailCallInlining.csproj
@@ -6,13 +6,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FastTailCallInlining.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/FastTailCall/GitHubIssue12479.csproj b/src/coreclr/tests/src/JIT/opt/FastTailCall/GitHubIssue12479.csproj
index 28fcda760c29f..fa09d694620a4 100644
--- a/src/coreclr/tests/src/JIT/opt/FastTailCall/GitHubIssue12479.csproj
+++ b/src/coreclr/tests/src/JIT/opt/FastTailCall/GitHubIssue12479.csproj
@@ -6,13 +6,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GitHubIssue12479.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/FastTailCall/StackFixup.csproj b/src/coreclr/tests/src/JIT/opt/FastTailCall/StackFixup.csproj
index a18c68c1a09db..421e75517b16d 100644
--- a/src/coreclr/tests/src/JIT/opt/FastTailCall/StackFixup.csproj
+++ b/src/coreclr/tests/src/JIT/opt/FastTailCall/StackFixup.csproj
@@ -6,13 +6,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="StackFixup.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/FastTailCall/StructPassingSimple.csproj b/src/coreclr/tests/src/JIT/opt/FastTailCall/StructPassingSimple.csproj
index 4c03ff7cd603e..649ea93af9e7e 100644
--- a/src/coreclr/tests/src/JIT/opt/FastTailCall/StructPassingSimple.csproj
+++ b/src/coreclr/tests/src/JIT/opt/FastTailCall/StructPassingSimple.csproj
@@ -6,13 +6,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="StructPassingSimple.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj b/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
index b4a4a70eeedb3..ba46b8f2c5061 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
index 887ff102c65c3..ebf937776be1b 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ArrayOfStructs.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
index 9532e2bd1c584..4eca7203211a4 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DelegInstanceFtn.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
index 21b996ed37dfd..ab03bd7c5fda0 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DelegStaticFtn.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
index 5bc924db3838c..1145384fba99e 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GenericStructs.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj
index bdd8767b20184..943c1bfd57e9d 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
index 873ff3d9785c9..6313c4eaa2f61 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
@@ -5,10 +5,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inlinethrow.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
index a96bde2ca1461..42566e71011f4 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_DelegateStruct.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
index 302c504884284..bcc81d90529c1 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_GenericMethods.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
index ef6bbc005bf68..53dac08be5c5b 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_Many.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
index bd4f11db8af6d..d6864f3fa6c90 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_MultipleReturn.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
index 5cc89910169bc..eb47d3a44ecf4 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_NewObj.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
index b9764834e8a4c..f8d20fa766adf 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_NormalizeStack.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
index d2e304fe10d08..d66b2dbe04de9 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_Recursion.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
index be1ac9bd3c92e..83cdc5840bc5d 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_RecursiveMethod.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
index ee092c7bd8d2b..cfff195d8528e 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_RecursiveMethod21.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
index 109f4070b8611..af192f3a46dd0 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_STARG.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
index b2e2db87651b5..0b01b9b124286 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_SideAffects.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
index 89463aa635886..d4b6acdf549ae 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_Vars.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
index c823076987d9b..f8ab374c1f44a 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Inline_handler.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
index 2c0769a3bb5f4..e5938af6f6406 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="LotsOfInlines.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
index a5e3e8b5d94d9..df7a544e29ff4 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ReturnStruct_Method.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
index d3560079bde66..c432ef7bca149 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="StructAsParam_Method.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
index 128270e370650..aa73f80ed1e9e 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="StructInClass.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
index de08205a4c46f..85dc5f2beea7b 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj
index 559757273bf85..8db166c372191 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="args1.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj
index 38d3c4e32eab0..996ee94edb599 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="args2.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj
index 0ff85a6343c0a..ed02d4d4a90ba 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="args3.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj
index 4096c84d095b8..3bd9bc2fcf06f 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="array.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj
index cc1fb38343d03..9f7d2c94d7961 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="debug.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj
index dbbb9fe5977ef..3c710a4a51292 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="deepcall.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj
index a334bf34b2cd4..af40d82db1281 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ifelse.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj
index 7628fe84d3c39..efe0b199c7778 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="indexer.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
index be790beea98f3..9f004cf8ab5ed 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="interfaceCall.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
index aa3222edfc4be..a3ed07dc11873 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="interfaceProperty.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
index 34fc106f8a93d..b4e967707b172 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
@@ -5,10 +5,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mathfunc.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
index 39831dede384c..b46b45eadce31 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mthdimpl.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj
index ffa3a632899c9..8e37bb6acb81b 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="property.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj
index 15b9d18d771e4..72d38e9a34853 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="size.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
index cde2a78f9bbd7..d350a83373dbe 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="struct_opcodes.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj
index b6644f659b3d1..12eec7f8cbcd1 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="throwTest.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj
index ea306656e0700..abbdb1fd1abe2 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj
@@ -6,10 +6,8 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="trycatch.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj b/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
index 20247d5460dc9..9f781b3e5e819 100644
--- a/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
+++ b/src/coreclr/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
     <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
index b2476223e3c33..5575799f97244 100644
--- a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
+++ b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
@@ -5,11 +5,9 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj
index 505e7423e2c74..7437d334d0076 100644
--- a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj
+++ b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj
@@ -7,13 +7,11 @@
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
     <Optimize>True</Optimize>
     <JitOptimizationSensitive>True</JitOptimizationSensitive>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="locals.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
index 04bdc258917f5..70707e2387edf 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
@@ -10,10 +10,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="bigvtbl.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
index 49433fe1c7e7d..5b80f8efbf4f4 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="bigvtbl.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
index 301b026213d0f..2f94181c369f6 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
@@ -9,10 +9,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="bigvtbl.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
index 3be7e67091fd7..b946bcd1f0b88 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
@@ -6,10 +6,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="bigvtbl.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
index 81a20866ba1a7..1f6e096e6e351 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ctest1.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
index 893c9468c5ca0..c426e7b3f3934 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ctest1.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
index de15da3650fe1..ee2e0437900c6 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize />
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ctest1.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
index 1c87810ac09e6..b1aae11940a4e 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
@@ -7,7 +7,6 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ctest1.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
index bc12e98107043..c8fdc281faea3 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
index 5eb45df54e0c6..038c262a3ff7a 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
index 7f25556be4b1c..cfb0ab60c573d 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed.cs" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
index fd0c03b54f1b7..3646a280bf78f 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
@@ -7,10 +7,8 @@
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed.cs" />
diff --git a/src/coreclr/tests/src/Loader/regressions/polyrec/Polyrec.csproj b/src/coreclr/tests/src/Loader/regressions/polyrec/Polyrec.csproj
index 86f0ce9da5188..794524e4dc9f0 100644
--- a/src/coreclr/tests/src/Loader/regressions/polyrec/Polyrec.csproj
+++ b/src/coreclr/tests/src/Loader/regressions/polyrec/Polyrec.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestExecutionArguments>4 50</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- This test leaves threads running at exit -->
diff --git a/src/coreclr/tests/src/Regressions/assemblyref/assem.csproj b/src/coreclr/tests/src/Regressions/assemblyref/assem.csproj
index a525d96c2b7ca..6970a36996896 100644
--- a/src/coreclr/tests/src/Regressions/assemblyref/assem.csproj
+++ b/src/coreclr/tests/src/Regressions/assemblyref/assem.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>library</OutputType>
     <CLRTestKind>SharedLibrary</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assem.cs" />
diff --git a/src/coreclr/tests/src/Regressions/assemblyref/test.csproj b/src/coreclr/tests/src/Regressions/assemblyref/test.csproj
index f9a331ce05c59..fc75b801b9894 100644
--- a/src/coreclr/tests/src/Regressions/assemblyref/test.csproj
+++ b/src/coreclr/tests/src/Regressions/assemblyref/test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/Regressions/expl_double/expl_double.csproj b/src/coreclr/tests/src/Regressions/expl_double/expl_double.csproj
index 2c56f9af79dbb..88b6aa8ef0fb3 100644
--- a/src/coreclr/tests/src/Regressions/expl_double/expl_double.csproj
+++ b/src/coreclr/tests/src/Regressions/expl_double/expl_double.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj b/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
index c6a5f9d047220..54a10c966a4af 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <DefineConstants Condition="$(OSGroup) == 'Windows_NT'">WINDOWS</DefineConstants>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj b/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj
index 933e291531e91..c7e6026192a4c 100644
--- a/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj
+++ b/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CLRTestKind>SharedLibrary</CLRTestKind>
+    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj b/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj
deleted file mode 100644
index 933e291531e91..0000000000000
--- a/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CLRTestKind>SharedLibrary</CLRTestKind>
-    <CLRTestPriority>1</CLRTestPriority>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="finalizer.cs" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/tests/src/baseservices/finalization/finalizer.cs b/src/coreclr/tests/src/baseservices/finalization/finalizer.cs
index 65dfe4fe2e0be..12dd6ee5bb8ce 100644
--- a/src/coreclr/tests/src/baseservices/finalization/finalizer.cs
+++ b/src/coreclr/tests/src/baseservices/finalization/finalizer.cs
@@ -15,7 +15,7 @@ public class Finalize : IFinalize
 }
 */
 //Test cases:
-//  Finalizers can not have a protection level (i.e Pubic, Protected, internal, protected internal, private)
+//  Finalizers can not have a protection level (i.e public, protected, internal, protected internal, private)
 //  Types in namespace can only be public or internal
 // Negative:
 //  Must do checks with reflection as types are scanned at assembly load time resulting in AssemblyLoad failures
@@ -120,7 +120,6 @@ public class Gen<T>
     public Gen() { }
 }
 
-#if STATIC
 public class Test
 {
     public static int Main()
@@ -190,4 +189,3 @@ private void RunGeneric()
         Gen<Finalizer> gen = new Gen<Finalizer>();        
     }
 }
-#endif
diff --git a/src/coreclr/tests/src/baseservices/threading/coverage/OSThreadId/osthreadid.csproj b/src/coreclr/tests/src/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
index 347485bb1d110..e7f6923b078a5 100644
--- a/src/coreclr/tests/src/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/managed/Compilation/Compilation.csproj b/src/coreclr/tests/src/managed/Compilation/Compilation.csproj
index 5ce5d0b1b0bdc..3d65b6a5d2ef9 100644
--- a/src/coreclr/tests/src/managed/Compilation/Compilation.csproj
+++ b/src/coreclr/tests/src/managed/Compilation/Compilation.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
diff --git a/src/coreclr/tests/src/readytorun/r2rdump/files/GcInfoTransitions.csproj b/src/coreclr/tests/src/readytorun/r2rdump/files/GcInfoTransitions.csproj
index 61d4a3e694e74..72a2463bfa871 100644
--- a/src/coreclr/tests/src/readytorun/r2rdump/files/GcInfoTransitions.csproj
+++ b/src/coreclr/tests/src/readytorun/r2rdump/files/GcInfoTransitions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/r2rdump/files/GenericFunctions.csproj b/src/coreclr/tests/src/readytorun/r2rdump/files/GenericFunctions.csproj
index 95de59029fa64..e803742221e65 100644
--- a/src/coreclr/tests/src/readytorun/r2rdump/files/GenericFunctions.csproj
+++ b/src/coreclr/tests/src/readytorun/r2rdump/files/GenericFunctions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/r2rdump/files/HelloWorld.csproj b/src/coreclr/tests/src/readytorun/r2rdump/files/HelloWorld.csproj
index a83b1c9b32a5a..a25bcc6527ae0 100644
--- a/src/coreclr/tests/src/readytorun/r2rdump/files/HelloWorld.csproj
+++ b/src/coreclr/tests/src/readytorun/r2rdump/files/HelloWorld.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/r2rdump/files/MultipleRuntimeFunctions.csproj b/src/coreclr/tests/src/readytorun/r2rdump/files/MultipleRuntimeFunctions.csproj
index 1103114c2b841..7261e58de3f5f 100644
--- a/src/coreclr/tests/src/readytorun/r2rdump/files/MultipleRuntimeFunctions.csproj
+++ b/src/coreclr/tests/src/readytorun/r2rdump/files/MultipleRuntimeFunctions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj b/src/coreclr/tests/src/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj
index 004898cfa7cb6..1ceecd2a654f2 100644
--- a/src/coreclr/tests/src/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/fileversionpreservation/fileversionpreservation.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestPriority>0</CLRTestPriority>
     <DebugType>PdbOnly</DebugType>
     <Optimize>True</Optimize>
diff --git a/src/coreclr/tests/src/readytorun/tests/genericsload/callgenericctor.csproj b/src/coreclr/tests/src/readytorun/tests/genericsload/callgenericctor.csproj
index c36073bd36f7c..fea8050315203 100644
--- a/src/coreclr/tests/src/readytorun/tests/genericsload/callgenericctor.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/genericsload/callgenericctor.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <ZapRequire>1</ZapRequire>
     <CLRTestPriority>1</CLRTestPriority>
     <CrossGenTest>false</CrossGenTest>
diff --git a/src/coreclr/tests/src/readytorun/tests/genericsload/usegenericfield.csproj b/src/coreclr/tests/src/readytorun/tests/genericsload/usegenericfield.csproj
index 23683cf888215..b5a3e6596061d 100644
--- a/src/coreclr/tests/src/readytorun/tests/genericsload/usegenericfield.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/genericsload/usegenericfield.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <ZapRequire>1</ZapRequire>
     <CLRTestPriority>1</CLRTestPriority>
     <CrossGenTest>false</CrossGenTest>
diff --git a/src/coreclr/tests/src/readytorun/tests/main.cs b/src/coreclr/tests/src/readytorun/tests/main.cs
index 4fdf935c5f972..2270e9c5b6860 100644
--- a/src/coreclr/tests/src/readytorun/tests/main.cs
+++ b/src/coreclr/tests/src/readytorun/tests/main.cs
@@ -8,9 +8,7 @@
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
-#if CORECLR
 using System.Runtime.Loader;
-#endif
 using System.Reflection;
 using System.IO;
 
@@ -77,28 +75,25 @@ static void TestMovedVirtualMethods()
         Assert.AreEqual(o.MovedToBaseClass(), "MovedToBaseClass");
         Assert.AreEqual(o.ChangedToVirtual(), "ChangedToVirtual");
 
-        if (!LLILCJitEnabled)
-        {
-            o = null;
+        o = null;
 
+        try
+        {
+            o.MovedToBaseClass();
+        }
+        catch (NullReferenceException)
+        {
             try
             {
-                o.MovedToBaseClass();
+                o.ChangedToVirtual();
             }
             catch (NullReferenceException)
             {
-                try
-                {
-                    o.ChangedToVirtual();
-                }
-                catch (NullReferenceException)
-                {
-                    return;
-                }
+                return;
             }
-
-            Assert.AreEqual("NullReferenceException", "thrown");
         }
+
+        Assert.AreEqual("NullReferenceException", "thrown");
     }
 
 
@@ -185,28 +180,25 @@ static void TestMovedGenericVirtualMethod()
         Assert.AreEqual(o.MovedToBaseClass<WeakReference>(), typeof(List<WeakReference>).ToString());
         Assert.AreEqual(o.ChangedToVirtual<WeakReference>(), typeof(List<WeakReference>).ToString());
 
-        if (!LLILCJitEnabled)
-        {
-            o = null;
+        o = null;
 
+        try
+        {
+            o.MovedToBaseClass<WeakReference>();
+        }
+        catch (NullReferenceException)
+        {
             try
             {
-                o.MovedToBaseClass<WeakReference>();
+                o.ChangedToVirtual<WeakReference>();
             }
             catch (NullReferenceException)
             {
-                try
-                {
-                    o.ChangedToVirtual<WeakReference>();
-                }
-                catch (NullReferenceException)
-                {
-                    return;
-                }
+                return;
             }
-
-            Assert.AreEqual("NullReferenceException", "thrown");
         }
+
+        Assert.AreEqual("NullReferenceException", "thrown");
     }
 
     [MethodImplAttribute(MethodImplOptions.NoInlining)]
@@ -329,7 +321,6 @@ static void TestRangeCheckElimination()
         Assert.AreEqual(array[2], 2);
     }
 
-#if CORECLR
     class MyLoadContext : AssemblyLoadContext
     {
         // If running in a collectible context, make the MyLoadContext collectible too so that it doesn't prevent
@@ -352,13 +343,10 @@ protected override Assembly Load(AssemblyName an)
 
     static void TestMultipleLoads()
     {
-        if (!LLILCJitEnabled) {
-            // Runtime should be able to load the same R2R image in another load context,
-            // even though it will be treated as an IL-only image.
-            new MyLoadContext().TestMultipleLoads();
-        }
+        // Runtime should be able to load the same R2R image in another load context,
+        // even though it will be treated as an IL-only image.
+        new MyLoadContext().TestMultipleLoads();
     }
-#endif
 
     static void TestFieldLayoutNGenMixAndMatch()
     {
@@ -470,9 +458,7 @@ static void RunAllTests()
 
         TestGetType();
 
-#if CORECLR
         TestMultipleLoads();
-#endif
 
         TestFieldLayoutNGenMixAndMatch();
 
@@ -495,15 +481,6 @@ static void RunAllTests()
 
     static int Main()
     {
-        // Code compiled by LLILC jit can't catch exceptions yet so the tests
-        // don't throw them if LLILC jit is enabled. This should be removed once
-        // exception catching is supported by LLILC jit.
-        string AltJitName = System.Environment.GetEnvironmentVariable("complus_altjitname");
-        LLILCJitEnabled =
-            ((AltJitName != null) && AltJitName.ToLower().StartsWith("llilcjit") &&
-             ((System.Environment.GetEnvironmentVariable("complus_altjit") != null) ||
-              (System.Environment.GetEnvironmentVariable("complus_altjitngen") != null)));
-
         // Run all tests 3x times to exercise both slow and fast paths work
         for (int i = 0; i < 3; i++)
            RunAllTests();
@@ -512,7 +489,5 @@ static int Main()
         return Assert.HasAssertFired ? 1 : 100;
     }
 
-    static bool LLILCJitEnabled;
-
     static int s;
 }
diff --git a/src/coreclr/tests/src/readytorun/tests/mainv1.csproj b/src/coreclr/tests/src/readytorun/tests/mainv1.csproj
index c8eccf69e4ec8..1960caef3576c 100644
--- a/src/coreclr/tests/src/readytorun/tests/mainv1.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/mainv1.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CrossGenTest>false</CrossGenTest>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/tests/mainv2.csproj b/src/coreclr/tests/src/readytorun/tests/mainv2.csproj
index c535880bc60db..4aae6ebedc96d 100644
--- a/src/coreclr/tests/src/readytorun/tests/mainv2.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/mainv2.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>exe</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CrossGenTest>false</CrossGenTest>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/readytorun/tests/testv1/test.csproj b/src/coreclr/tests/src/readytorun/tests/testv1/test.csproj
index e488fc5b3d630..970a6904e4f11 100644
--- a/src/coreclr/tests/src/readytorun/tests/testv1/test.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/testv1/test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/tests/testv2/test.csproj b/src/coreclr/tests/src/readytorun/tests/testv2/test.csproj
index 981b5c088ed4a..b05e700576c81 100644
--- a/src/coreclr/tests/src/readytorun/tests/testv2/test.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/testv2/test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR;V2</DefineConstants>
+    <DefineConstants>$(DefineConstants);V2</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/readytorun/tests/versionbubbles/helper.csproj b/src/coreclr/tests/src/readytorun/tests/versionbubbles/helper.csproj
index f93f42b954cb7..9395dc3983976 100644
--- a/src/coreclr/tests/src/readytorun/tests/versionbubbles/helper.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/versionbubbles/helper.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <Optimize>True</Optimize>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj b/src/coreclr/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj
index 316b4b7715fc3..d9e83b34f0e0a 100644
--- a/src/coreclr/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj
+++ b/src/coreclr/tests/src/readytorun/tests/versionbubbles/versionbubbles.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <ZapRequire>1</ZapRequire>
     <CLRTestPriority>1</CLRTestPriority>
     <DebugType>PdbOnly</DebugType>
diff --git a/src/coreclr/tests/src/tracing/common/common.csproj b/src/coreclr/tests/src/tracing/common/common.csproj
index a12ef45df858d..a84fad74bb0a0 100644
--- a/src/coreclr/tests/src/tracing/common/common.csproj
+++ b/src/coreclr/tests/src/tracing/common/common.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/tracing/eventactivityidcontrol/eventactivityidcontrol.csproj b/src/coreclr/tests/src/tracing/eventactivityidcontrol/eventactivityidcontrol.csproj
index 4714586ff9086..ecd430f0b5a98 100644
--- a/src/coreclr/tests/src/tracing/eventactivityidcontrol/eventactivityidcontrol.csproj
+++ b/src/coreclr/tests/src/tracing/eventactivityidcontrol/eventactivityidcontrol.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/tracing/eventcounter/eventcounter.csproj b/src/coreclr/tests/src/tracing/eventcounter/eventcounter.csproj
index 1b048105e7290..e7d06199161a1 100644
--- a/src/coreclr/tests/src/tracing/eventcounter/eventcounter.csproj
+++ b/src/coreclr/tests/src/tracing/eventcounter/eventcounter.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventcounter/incrementingeventcounter.csproj b/src/coreclr/tests/src/tracing/eventcounter/incrementingeventcounter.csproj
index bf7c8baa0279f..20c917f8d8b4c 100644
--- a/src/coreclr/tests/src/tracing/eventcounter/incrementingeventcounter.csproj
+++ b/src/coreclr/tests/src/tracing/eventcounter/incrementingeventcounter.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventcounter/incrementingpollingcounter.csproj b/src/coreclr/tests/src/tracing/eventcounter/incrementingpollingcounter.csproj
index 1445e58efa7d9..dce7ed6feea5b 100644
--- a/src/coreclr/tests/src/tracing/eventcounter/incrementingpollingcounter.csproj
+++ b/src/coreclr/tests/src/tracing/eventcounter/incrementingpollingcounter.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventcounter/pollingcounter.csproj b/src/coreclr/tests/src/tracing/eventcounter/pollingcounter.csproj
index 2dc6b860c5791..bd666833b0299 100644
--- a/src/coreclr/tests/src/tracing/eventcounter/pollingcounter.csproj
+++ b/src/coreclr/tests/src/tracing/eventcounter/pollingcounter.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventcounter/regression-25709.csproj b/src/coreclr/tests/src/tracing/eventcounter/regression-25709.csproj
index 54579435b99ae..2d73612dff46a 100644
--- a/src/coreclr/tests/src/tracing/eventcounter/regression-25709.csproj
+++ b/src/coreclr/tests/src/tracing/eventcounter/regression-25709.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventlistener/eventlistener.csproj b/src/coreclr/tests/src/tracing/eventlistener/eventlistener.csproj
index 7f20253ad12ca..ef879e9e2af27 100644
--- a/src/coreclr/tests/src/tracing/eventlistener/eventlistener.csproj
+++ b/src/coreclr/tests/src/tracing/eventlistener/eventlistener.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/buffersize/buffersize.csproj b/src/coreclr/tests/src/tracing/eventpipe/buffersize/buffersize.csproj
index e3f412d868889..6d5ae5ccf18d8 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/buffersize/buffersize.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/buffersize/buffersize.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/common/common.csproj b/src/coreclr/tests/src/tracing/eventpipe/common/common.csproj
index 4d2b7cb05fc06..0df38b391df23 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/common/common.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/common/common.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>Library</OutputType>
     <CLRTestKind>SharedLibrary</CLRTestKind>
-    <!-- <DefineConstants>$(DefineConstants);STATIC</DefineConstants> -->
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.csproj b/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.csproj
index c152b0d7cbcef..82e23a96b47be 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/ExceptionThrown_V1.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCEvents.csproj b/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCEvents.csproj
index 227e24ef107a7..9fd932ebaf995 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCEvents.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCEvents.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCFinalizers.csproj b/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCFinalizers.csproj
index 593880865fb76..ed138ccb37b1f 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCFinalizers.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/eventsvalidation/GCFinalizers.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/providervalidation/providervalidation.csproj b/src/coreclr/tests/src/tracing/eventpipe/providervalidation/providervalidation.csproj
index e3f412d868889..6d5ae5ccf18d8 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/providervalidation/providervalidation.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/providervalidation/providervalidation.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
diff --git a/src/coreclr/tests/src/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj b/src/coreclr/tests/src/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj
index 214f067e4c80e..60f19b5233427 100644
--- a/src/coreclr/tests/src/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj
+++ b/src/coreclr/tests/src/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <OutputType>exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
diff --git a/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj b/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
index e350257d96c04..f15d80eb15561 100644
--- a/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
+++ b/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
diff --git a/src/coreclr/tests/src/tracing/eventsource/eventsourcetrace/eventsourcetrace.csproj b/src/coreclr/tests/src/tracing/eventsource/eventsourcetrace/eventsourcetrace.csproj
index f917f93b54027..433fbf78c7756 100644
--- a/src/coreclr/tests/src/tracing/eventsource/eventsourcetrace/eventsourcetrace.csproj
+++ b/src/coreclr/tests/src/tracing/eventsource/eventsourcetrace/eventsourcetrace.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <!-- https://github.com/dotnet/coreclr/issues/24423 -->
diff --git a/src/coreclr/tests/src/tracing/regress/GitHub_22247/GitHub_22247.csproj b/src/coreclr/tests/src/tracing/regress/GitHub_22247/GitHub_22247.csproj
index ef9d20f5ee70e..c6c03714e2f0b 100644
--- a/src/coreclr/tests/src/tracing/regress/GitHub_22247/GitHub_22247.csproj
+++ b/src/coreclr/tests/src/tracing/regress/GitHub_22247/GitHub_22247.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
diff --git a/src/coreclr/tests/src/tracing/runtimeeventsource/runtimeeventsource.csproj b/src/coreclr/tests/src/tracing/runtimeeventsource/runtimeeventsource.csproj
index 65fbe73ae1e07..70336054f35e5 100644
--- a/src/coreclr/tests/src/tracing/runtimeeventsource/runtimeeventsource.csproj
+++ b/src/coreclr/tests/src/tracing/runtimeeventsource/runtimeeventsource.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/tracing/tracecontrol/tracecontrol.csproj b/src/coreclr/tests/src/tracing/tracecontrol/tracecontrol.csproj
index fd5fa3b461cc3..da48f7af6fd4f 100644
--- a/src/coreclr/tests/src/tracing/tracecontrol/tracecontrol.csproj
+++ b/src/coreclr/tests/src/tracing/tracecontrol/tracecontrol.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/tracing/tracevalidation/inducedgc/inducedgc.csproj b/src/coreclr/tests/src/tracing/tracevalidation/inducedgc/inducedgc.csproj
index 0f44ddb1d72ef..48da17fdcadd7 100644
--- a/src/coreclr/tests/src/tracing/tracevalidation/inducedgc/inducedgc.csproj
+++ b/src/coreclr/tests/src/tracing/tracevalidation/inducedgc/inducedgc.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- Due to https://github.com/dotnet/coreclr/issues/22247 -->
diff --git a/src/coreclr/tests/src/tracing/tracevalidation/jittingstarted/JittingStarted.csproj b/src/coreclr/tests/src/tracing/tracevalidation/jittingstarted/JittingStarted.csproj
index d1d6ec54fdb6f..67b146cdfa92e 100644
--- a/src/coreclr/tests/src/tracing/tracevalidation/jittingstarted/JittingStarted.csproj
+++ b/src/coreclr/tests/src/tracing/tracevalidation/jittingstarted/JittingStarted.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- Due to https://github.com/dotnet/coreclr/issues/22247 -->
diff --git a/src/coreclr/tests/src/tracing/tracevalidation/rundown/rundown.csproj b/src/coreclr/tests/src/tracing/tracevalidation/rundown/rundown.csproj
index 2450266e82287..3a84775b8fef8 100644
--- a/src/coreclr/tests/src/tracing/tracevalidation/rundown/rundown.csproj
+++ b/src/coreclr/tests/src/tracing/tracevalidation/rundown/rundown.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>0</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
     <!-- Due to https://github.com/dotnet/coreclr/issues/22247 -->
diff --git a/src/coreclr/tests/src/tracing/tracevalidation/tracelogging/tracelogging.csproj b/src/coreclr/tests/src/tracing/tracevalidation/tracelogging/tracelogging.csproj
index 0865ef1fb8db6..d9745a47f40de 100644
--- a/src/coreclr/tests/src/tracing/tracevalidation/tracelogging/tracelogging.csproj
+++ b/src/coreclr/tests/src/tracing/tracevalidation/tracelogging/tracelogging.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>