Use runtest.py to run tests for all platforms (#19213)

Change build-test.sh to always build the xunit wrappers. Before it would drop a token and check the existence of the token.

Unify x64 linux/OSX/Windows excludes into one file, issues.targets. Includes different locations in the file which show where to put excludes.

Remove all target specific aspects of issues.targets, all tests are excluded now via wildcard, this allows expanding to .cmd and .sh based on the built platform.

Unify path separators to forward slash(/) in issues.targets to support both platforms

Clean up issues.targets by removing long standing exclude tests, specifically tests that have been excluded due to missing features like rva_statics.
Add DisableProjectBuild to tests which have been removed from issues.targets

Conditionally add DisableProjectBuild to tests which have been marked as unsupported on unix. This is mostly a port of the unsupportedOnUnix.txt list. Instead of excluding the tests, unix will simply not build them. If tests are built on windows, they will be run but they will return pass, the test wrapper will check return instantly.

All exclusions ported to issues.targets for linux targets.
Expand runtest.py, this includes simple issues that made it past the original CR. In addition it adds more optional features to help with inner loop dev work such as: creating a repro folder under bin/repro/.. which sets up the env and calls the failing test. In addition a launch.json will now be created under bin/repro/.. which can be used to easily debug using vscode. More logging, such as printing failures, longest running tests ect.
Initial excludes ported for arm64 windows

Arm64 linux, armhf unix excludes and enables running runtest.sh for these targets.
arm64 windows and arm32 windows excludes and enables running runtest.cmd on arm64 targets
init-tools.sh changes to pull armhf and aarch64 dotnetcli

init-tools.cmd changes to pull x86 packages for dotnetcli for arm64 windows
runtest.cmd for almost all scenarios will call runtest.py
runtest.sh for almsot all scenarios will call runtest.py
Removes all logic for running tests using runtest.sh

310 files changed, 5455 insertions, 1950 deletions

diff --git a/Documentation/building/test-configuration.md b/Documentation/building/test-configuration.md
index 14fbb4e3d6..d799bfdaad 100644
--- a/Documentation/building/test-configuration.md
+++ b/Documentation/building/test-configuration.md
@@ -39,15 +39,17 @@ Test cases are categorized by priority level. The most important subset should b
     ```
 * Disable building of a test by conditionally setting the `<DisableProjectBuild>` property.
 	* e.g. `<DisableProjectBuild Condition=" '$(Platform)' == 'arm64' ">true</DisableProjectBuild>`
+* Exclude test from GCStress runs by adding the following to the csproj:
+    * `<GCStressIncompatible>true</GCStressIncompatible>`
+* Exclude test from JIT stress runs runs by adding the following to the csproj:
+    * `<JitOptimizationSensitive>true</JitOptimizationSensitive>`
 * Add NuGet/MyGet references by updating the following [test project](https://github.com/dotnet/coreclr/blob/master/tests/src/Common/test_dependencies/test_dependencies.csproj).
 * Build against the `mscorlib` facade by adding `<ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>` to the test project.
 * Update relevent exclusion lists:
-  * Note that there are two build pipelines Jenkin's CI and nightly Helix - both must be updated for expected exclusion.
-    * Jenkin's CI build - see the associated `*.txt` files under `tests/` (e.g. `tests/testsUnsupportedOutsideWindows.txt`).
-    * Official nightly Helix build - see the `tests/issues.targets` file.
-  * ARM/ARM64
-    * `tests/arm/Tests.lst` and `tests/arm64/Tests.lst` are used to define the tests to run due to limitations with XUnit.
-    * These files can be manually edited or the generated using `tests/scripts/lst_creator.py`.
+  There are currently three different exclude lists. Tests.lst is currently only used by CI.
+    - `tests/issues.targets`
+    - `tests/arm/Tests.lst` - Used by Windows arm32 testing
+    - `tests/arm64/Tests.lst` - Used by Windows arm64 testing
 
 ### Creating a C# test project
 
diff --git a/Documentation/building/unix-test-instructions.md b/Documentation/building/unix-test-instructions.md
index 89fead7aa6..9b0190c4a0 100644
--- a/Documentation/building/unix-test-instructions.md
+++ b/Documentation/building/unix-test-instructions.md
@@ -81,50 +81,15 @@ sudo apt-get install libunwind8:armhf libunwind8-dev:armhf libicu-dev:armhf libl
 The following instructions assume that on the Unix machine:
 - The CoreCLR repo is cloned at `/mnt/coreclr`
 
-If DotNet is unsupported
-- The CoreFX repo is cloned at `/mnt/corefx`
-- The other platform's clone of the CoreCLR repo is mounted at `/media/coreclr`
-
-The following steps are different if DotNet is supported or not on your arch and os.
-
-### DotNet is supported
-
-build-test.sh will have setup the Core_Root directory correctly after the test build. If this was either skipped or needs to be regenerated use:
-
->`build-test.sh generatelayoutonly`
-
-To run the tests run with the --coreOverlayDir path
+build-test.sh will have setup the Core_Root directory correctly after the test build.
 
 ```bash
-~/coreclr$ tests/runtest.sh
-    --testRootDir=/mnt/coreclr/bin/tests/Linux.x64.Debug
-    --testNativeBinDir=/mnt/coreclr/bin/obj/Linux.x64.Debug/tests
-    --coreOverlayDir=/mnt/coreclr/bin/tests/Linux.x64.Debug/Tests/Core_Root
-    --copyNativeTestBin
+~/coreclr$ tests/runtest.sh x64 checked
 ```
 
-### DotNet is not supported
-
-Tests need to be built on another platform and copied over to the Unix machine for testing. Copy the test build over to the Unix machine:
-
-> `cp --recursive /media/coreclr/bin/tests/Windows_NT.x64.Debug /mnt/test/`
-
-See `runtest.sh` usage information:
-
-> `/mnt/coreclr$ tests/runtest.sh --help`
-
-Run tests (`Debug` may be replaced with `Release` or `Checked`, depending on which Configuration you've built):
+Please use the following command for help.
 
-```bash
-/mnt/coreclr$ tests/runtest.sh
-    --testRootDir=/mnt/test/Windows_NT.x64.Debug
-    --testNativeBinDir=/mnt/coreclr/bin/obj/Linux.x64.Debug/tests
-    --coreClrBinDir=/mnt/coreclr/bin/Product/Linux.x64.Debug
-    --mscorlibDir=/mnt/coreclr/bin/Product/Linux.x64.Debug
-    --coreFxBinDir=/mnt/corefx/bin/runtime/netcoreapp-Linux-Debug-x64
-```
-
-The method above will copy dependencies from the set of directories provided to create an 'overlay' directory.
+>./tests/runtest.sh -h
 
 ### Results
 
@@ -134,13 +99,21 @@ Test results will go into:
 
 ### Unsupported and temporarily disabled tests
 
-These tests are skipped by default:
-- Tests that are not supported outside Windows, are listed in:
-    > `~/coreclr/tests/testsUnsupportedOutsideWindows.txt`
-- Tests that are temporarily disabled outside Windows due to unexpected failures (pending investigation), are listed in:
-    > `~/coreclr/tests/testsFailingOutsideWindows.txt`
+Unsupported tests outside of Windows have two annotations in their csproj to
+ignore them when run.
+
+```
+<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+```
+
+This will write in the bash target to skip the test by returning a passing value if run outside Windows.
+
+In addition:
+```
+<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
+```
 
-To run only the set of temporarily disabled tests, pass in the `--runFailingTestsOnly` argument to `runtest.sh`.
+Is used to disable the build, that way if building on unix cycles are saved building/running.
 
 PAL tests
 ---------
diff --git a/Documentation/building/windows-test-instructions.md b/Documentation/building/windows-test-instructions.md
index 631f036da9..de422ed571 100644
--- a/Documentation/building/windows-test-instructions.md
+++ b/Documentation/building/windows-test-instructions.md
@@ -21,9 +21,9 @@ This will use `crossgen.exe` to precompile the test executables before they are
 
 ## Building Other Priority Tests
 
-    C:\git\coreclr>build-test.cmd -priority=2
+    C:\git\coreclr>build-test.cmd -priority=1
 
-The number '2' is just an example. The default value (if no priority is specified) is 0. To clarify, if '2' is specified, all tests with CLRTestPriorty 0, 1 **and** 2 will be built and consequently run.
+The number '1' is just an example. The default value (if no priority is specified) is 0. To clarify, if '1' is specified, all tests with CLRTestPriorty 0 **and** 1 will be built and consequently run.
 
 ## Examples
 
@@ -35,7 +35,7 @@ To run a clean, priority 1, crossgen test pass:
 
 ### Building Individual Tests
 
-Note: buildtest.cmd or build.cmd skipnative skipmscorlib needs to be run atleast once
+Note: build-test.cmd or build.cmd skipnative needs to be run atleast once
 
 * Native Test: Build the generated Visual Studio solution or make file corresponding to Test cmake file.
   
@@ -47,7 +47,7 @@ Note: buildtest.cmd or build.cmd skipnative skipmscorlib needs to be run atleast
 
 For example to run all of the tests using your checked build:
 
-     <repo_root>\tests\runtest.cmd -checked
+     <repo_root>\tests\runtest.cmd checked
 
 This will generate a report named as `TestRun_<arch>_<flavor>.html` (e.g. `TestRun_Windows_NT__x64__Checked.html`) in the subdirectory `<repo_root>\bin\Logs`. Any tests that failed will be listed in `TestRunResults_Windows_NT__x64__Checked.err`.
 
diff --git a/build-test.sh b/build-test.sh
index b8b2955f97..c2428f5f65 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -289,22 +289,18 @@ build_Tests()
     if [ $__BuildTestWrappers -ne -0 ]; then
         echo "${__MsgPrefix}Creating test wrappers..."
 
-        __XUnitWrapperBuiltMarker=${__TestBinDir}/xunit_wrapper_build
+        # Always create the test wrappers and set the exclude file.
+        export __Exclude="$__TestDir/issues.targets"
+        echo "Exclude set to $__TestDir/issues.targets"
+        build_Tests_internal "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "Test Xunit Wrapper" "-BuildWrappers" "-MsBuildEventLogging= " "-TargetsWindows=false"
 
-        if [ ! -f $__XUnitWrapperBuiltMarker ]; then
-
-            build_MSBuild_projects "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "Test Xunit Wrapper" "-BuildWrappers" "-MsBuildEventLogging= " "-TargetsWindows=false"
-
-            if [ $? -ne 0 ]; then
-                echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
-                exit 1
-            else
-                echo "XUnit Wrappers have been built."
-                echo "Create marker \"${__XUnitWrapperBuiltMarker}\""
-                touch $__XUnitWrapperBuiltMarker
-            fi
+        if [ $? -ne 0 ]; then
+            echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
+            exit 1
         else
-            echo "XUnit Wrappers had been built before."
+            echo "XUnit Wrappers have been built."
+            echo "Create marker \"${__XUnitWrapperBuiltMarker}\""
+            touch $__XUnitWrapperBuiltMarker
         fi
     fi
 
diff --git a/init-tools.cmd b/init-tools.cmd
index 305fe49d5f..90a0315e34 100644
--- a/init-tools.cmd
+++ b/init-tools.cmd
@@ -47,9 +47,33 @@ echo Running %0 > "%INIT_TOOLS_LOG%"
 set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
 if exist "%DOTNET_CMD%" goto :afterdotnetrestore
 
+REM Use x86 tools on arm64 and x86.
+REM arm32 host is not currently supported, please crossbuild.
+if /i "%PROCESSOR_ARCHITECTURE%" == "arm" (
+  echo "Error, arm32 arch not supported for build tools."
+  exit /b 1
+)
+
+if /i "%PROCESSOR_ARCHITECTURE%" == "amd64" (
+  set _Arch="x64"
+  goto ArchSet
+)
+
+REM If this is not amd64 and not arm, then we should be running on arm64 or x86
+REM either way we can (and should) use the x86 dotnet cli
+REM
+REM TODO: consume native arm64 toolset, blocked by official arm64 windows cli
+REM     : release. See https://github.com/dotnet/coreclr/issues/19614 for more
+REM     : information
+set _Arch="x86"
+
+echo "init-tools.cmd: Setting arch to %_Arch% for build tools"
+
+:ArchSet
+
 echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
-set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip
+set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-%_Arch%.zip
 set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
 set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
 echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
diff --git a/init-tools.sh b/init-tools.sh
index f9c0054eb8..f62ccb8cf2 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -71,7 +71,17 @@ if [ ! -e "$__DOTNET_PATH" ]; then
             echo "Warning: build not supported on 32 bit Unix"
         fi
 
-        __PKG_ARCH=x64
+        if [ "$(uname -m)" = "armhf" ] || [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ];  then
+            if [ "$(uname -m)" = "armhf" ]; then
+                __PKG_ARCH=arm
+            fi
+
+            if [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then
+                __PKG_ARCH=arm64
+            fi
+        else
+            __PKG_ARCH=x64
+        fi
 
         OSName=$(uname -s)
         case $OSName in
@@ -171,26 +181,30 @@ if [ -n "${DotNetBootstrapCliTarPath-}" ]; then
     unset ILASMCOMPILER_VERSION
 fi
 
-echo "Initializing BuildTools..."
-echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> "$__init_tools_log"
-
-# Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
-chmod +x "$__BUILD_TOOLS_PATH/init-tools.sh"
-"$__BUILD_TOOLS_PATH/init-tools.sh" "$__scriptpath" "$__DOTNET_CMD" "$__TOOLRUNTIME_DIR" "$__PACKAGES_DIR" >> "$__init_tools_log"
-if [ "$?" != "0" ]; then
-    echo "ERROR: An error occurred when trying to initialize the tools." 1>&2
-    display_error_message
-    exit 1
-fi
-
-echo "Making all .sh files executable under Tools."
-# Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
-ls "$__scriptpath/Tools/"*.sh | xargs chmod +x
-ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x
+# Build tools only supported on x64
+if [ "${__PKG_ARCH}" != "x64" ] &&  [ "${__PKG_ARCH}" != "arm" ]; then
+    echo "Skipped installing build tools."
+else
+    echo "Initializing BuildTools..."
+    echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> "$__init_tools_log"
+
+    # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
+    chmod +x "$__BUILD_TOOLS_PATH/init-tools.sh"
+    "$__BUILD_TOOLS_PATH/init-tools.sh" "$__scriptpath" "$__DOTNET_CMD" "$__TOOLRUNTIME_DIR" "$__PACKAGES_DIR" >> "$__init_tools_log"
+    if [ "$?" != "0" ]; then
+        echo "ERROR: An error occurred when trying to initialize the tools." 1>&2
+        display_error_message
+        exit 1
+    fi
 
-"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools" $__PKG_RID
+    echo "Making all .sh files executable under Tools."
+    # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424
+    ls "$__scriptpath/Tools/"*.sh | xargs chmod +x
+    ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x
 
-mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE"
+    "$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools" $__PKG_RID
 
-echo "Done initializing tools."
+    mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE"
 
+    echo "Done initializing tools."
+fi
diff --git a/tests/arm/Tests.lst b/tests/arm/Tests.lst
index b18febd2ca..a1b00baa9e 100644
--- a/tests/arm/Tests.lst
+++ b/tests/arm/Tests.lst
@@ -53204,14 +53204,6 @@ MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
-[b12011.cmd_6691]
-RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011\b12011.cmd
-WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=EXPECTED_PASS
-HostStyle=0
-
 [FlowControlNext.cmd_6692]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlNext\FlowControlNext.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlNext
diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst
index 2c7f403d63..ffbdf2c642 100644
--- a/tests/arm64/Tests.lst
+++ b/tests/arm64/Tests.lst
@@ -70244,14 +70244,6 @@ MaxAllowedDurationSeconds=600
 Categories=JIT;EXPECTED_PASS
 HostStyle=0
 
-[b12011.cmd_9160]
-RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011\b12011.cmd
-WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=EXPECTED_PASS
-HostStyle=0
-
 [b14355.cmd_9161]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14355\b14355\b14355.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14355\b14355
diff --git a/tests/bringup_runtest.sh b/tests/bringup_runtest.sh
new file mode 100755
index 0000000000..a4631a72c9
--- /dev/null
+++ b/tests/bringup_runtest.sh
@@ -0,0 +1,1517 @@
+#!/usr/bin/env bash
+
+function print_usage {
+    echo ''
+    echo 'CoreCLR test runner script.'
+    echo ''
+    echo 'Typical command line:'
+    echo ''
+    echo 'coreclr/tests/runtest.sh'
+    echo '    --testRootDir="temp/Windows_NT.x64.Debug"'
+    echo '    --testNativeBinDir="coreclr/bin/obj/Linux.x64.Debug/tests"'
+    echo '    --coreOverlayDir="coreclr/bin/tests/Linux.x64.Debug/Tests/Core_Root"'
+    echo '    --copyNativeTestBin'
+    echo ''
+    echo 'Required arguments:'
+    echo '  --testRootDir=<path>             : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).'
+    echo '  --testNativeBinDir=<path>        : Directory of the native CoreCLR test build (e.g. coreclr/bin/obj/Linux.x64.Debug/tests).'
+    echo '  (Also required: Either --coreOverlayDir, or all of the switches --coreOverlayDir overrides)'
+    echo ''
+    echo 'Optional arguments:'
+    echo '  --coreOverlayDir=<path>          : Directory containing core binaries and test dependencies. If not specified, the'
+    echo '                                     default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,'
+    echo '                                     --mscorlibDir, and --coreFxBinDir.'
+    echo '  --coreClrBinDir=<path>           : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).'
+    echo '  --mscorlibDir=<path>             : Directory containing the built mscorlib.dll. If not specified, it is expected to be'
+    echo '                                       in the directory specified by --coreClrBinDir.'
+    echo '  --coreFxBinDir="<path>"          : Directory with CoreFX build outputs'
+    echo '                                     (e.g. "corefx/bin/runtime/netcoreapp-Linux-Debug-x64")'
+    echo '                                     If files with the same name are present in multiple directories, the first one wins.'
+    echo '  --testDir=<path>                 : Run tests only in the specified directory. The path is relative to the directory'
+    echo '                                     specified by --testRootDir. Multiple of this switch may be specified.'
+    echo '  --testDirFile=<path>             : Run tests only in the directories specified by the file at <path>. Paths are listed'
+    echo '                                     one line, relative to the directory specified by --testRootDir.'
+    echo '  --build-overlay-only             : Build coreoverlay only, and skip running tests.'
+    echo '  --runFailingTestsOnly            : Run only the tests that are disabled on this platform due to unexpected failures.'
+    echo '                                     Failing tests are listed in coreclr/tests/failingTestsOutsideWindows.txt, one per'
+    echo '                                     line, as paths to .sh files relative to the directory specified by --testRootDir.'
+    echo '  --disableEventLogging            : Disable the events logged by both VM and Managed Code'
+    echo '  --sequential                     : Run tests sequentially (default is to run in parallel).'
+    echo '  --playlist=<path>                : Run only the tests that are specified in the file at <path>, in the same format as'
+    echo '                                     runFailingTestsOnly'
+    echo '  -v, --verbose                    : Show output from each test.'
+    echo '  -h|--help                        : Show usage information.'
+    echo '  --useServerGC                    : Enable server GC for this test run'
+    echo '  --test-env                       : Script to set environment variables for tests'
+    echo '  --copyNativeTestBin              : Explicitly copy native test components into the test dir'
+    echo '  --crossgen                       : Precompiles the framework managed assemblies'
+    echo '  --runcrossgentests               : Runs the ready to run tests' 
+    echo '  --jitstress=<n>                  : Runs the tests with COMPlus_JitStress=n'
+    echo '  --jitstressregs=<n>              : Runs the tests with COMPlus_JitStressRegs=n'
+    echo '  --jitminopts                     : Runs the tests with COMPlus_JITMinOpts=1'
+    echo '  --jitforcerelocs                 : Runs the tests with COMPlus_ForceRelocs=1'
+    echo '  --jitdisasm                      : Runs jit-dasm on the tests'
+    echo '  --gcstresslevel=<n>              : Runs the tests with COMPlus_GCStress=n'
+    echo '  --gcname=<n>                     : Runs the tests with COMPlus_GCName=n'
+    echo '  --ilasmroundtrip                 : Runs ilasm round trip on the tests'
+    echo '    0: None                                1: GC on all allocs and '"'easy'"' places'
+    echo '    2: GC on transitions to preemptive GC  4: GC on every allowable JITed instr'
+    echo '    8: GC on every allowable NGEN instr   16: GC only on a unique stack trace'
+    echo '  --long-gc                        : Runs the long GC tests'
+    echo '  --gcsimulator                    : Runs the GCSimulator tests'
+    echo '  --tieredcompilation              : Runs the tests with COMPlus_TieredCompilation=1'
+    echo '  --link <ILlink>                  : Runs the tests after linking via ILlink'
+    echo '  --show-time                      : Print execution sequence and running time for each test'
+    echo '  --no-lf-conversion               : Do not execute LF conversion before running test script'
+    echo '  --limitedDumpGeneration          : Enables the generation of a limited number of core dumps if test(s) crash, even if ulimit'
+    echo '                                     is zero when launching this script. This option is intended for use in CI.'
+    echo '  --xunitOutputPath=<path>         : Create xUnit XML report at the specifed path (default: <test root>/coreclrtests.xml)'
+    echo ''
+    echo 'CoreFX Test Options '
+    echo '  --corefxtests                    : Runs CoreFX tests'
+    echo '  --corefxtestsall                 : Runs all available CoreFX tests'
+    echo '  --corefxtestlist=<path>          : Runs the CoreFX tests specified in the passed list'   
+    echo '  --testHostDir=<path>             : Directory containing a built test host including core binaries, test dependencies' 
+    echo '                                     and a dotnet executable'
+    echo ''
+    echo 'Runtime Code Coverage options:'
+    echo '  --coreclr-coverage               : Optional argument to get coreclr code coverage reports'
+    echo '  --coreclr-objs=<path>            : Location of root of the object directory'
+    echo '                                     containing the linux/mac coreclr build'
+    echo '  --coreclr-src=<path>             : Location of root of the directory'
+    echo '                                     containing the coreclr source files'
+    echo '  --coverage-output-dir=<path>     : Directory where coverage output will be written to'
+    echo ''
+}
+
+function print_results {
+    echo ""
+    echo "======================="
+    echo "     Test Results"
+    echo "======================="
+    echo "# CoreCLR Bin Dir  : $coreClrBinDir"
+    echo "# Tests Discovered : $countTotalTests"
+    echo "# Passed           : $countPassedTests"
+    echo "# Failed           : $countFailedTests"
+    echo "# Skipped          : $countSkippedTests"
+    echo "======================="
+}
+
+# Initialize counters for bookkeeping.
+countTotalTests=0
+countPassedTests=0
+countFailedTests=0
+countSkippedTests=0
+
+# Variables for xUnit-style XML output. XML format: https://xunit.github.io/docs/format-xml-v2.html
+xunitOutputPath=
+xunitTestOutputPath=
+
+# Variables for text file output. These can be passed back to runtest.sh using the "--playlist" argument
+# to rerun specific tests.
+testsPassOutputPath=
+testsFailOutputPath=
+testsSkipOutputPath=
+
+# libExtension determines extension for dynamic library files
+# runtimeName determines where CoreFX Runtime files will be located
+OSName=$(uname -s)
+libExtension=
+case $OSName in
+    Darwin)
+        libExtension="dylib"
+        ;;
+
+    Linux)
+        libExtension="so"
+        ;;
+
+    NetBSD)
+        libExtension="so"
+        ;;
+
+    *)
+        echo "Unsupported OS $OSName detected, configuring as if for Linux"
+        libExtension="so"
+        ;;
+esac
+
+function xunit_output_begin {
+    if [ -z "$xunitOutputPath" ]; then
+        xunitOutputPath=$testRootDir/coreclrtests.xml
+    fi
+    if ! [ -e $(basename "$xunitOutputPath") ]; then
+        xunitOutputPath=$testRootDir/coreclrtests.xml
+    fi
+    xunitTestOutputPath=${xunitOutputPath}.test
+    if [ -e "$xunitOutputPath" ]; then
+        rm -f -r "$xunitOutputPath"
+    fi
+    if [ -e "$xunitTestOutputPath" ]; then
+        rm -f -r "$xunitTestOutputPath"
+    fi
+}
+
+function xunit_output_add_test {
+    # <assemblies>
+    #   <assembly>
+    #     <collection>
+    #       <test .../> <!-- Write this element here -->
+
+    local scriptFilePath=$1
+    local outputFilePath=$2
+    local testResult=$3 # Pass, Fail, or Skip
+    local testScriptExitCode=$4
+    local testRunningTime=$5
+
+    local testPath=${scriptFilePath%.sh} # Remove trailing ".sh"
+    local testDir=$(dirname "$testPath")
+    local testName=$(basename "$testPath")
+
+    # Replace '/' with '.'
+    testPath=$(echo "$testPath" | tr / .)
+    testDir=$(echo "$testDir" | tr / .)
+
+    local line
+
+    line="      "
+    line="${line}<test"
+    line="${line} name=\"${testPath}\""
+    line="${line} type=\"${testDir}\""
+    line="${line} method=\"${testName}\""
+    line="${line} result=\"${testResult}\""
+    if [ -n "$testRunningTime" ] && [ "$testResult" != "Skip" ]; then
+        line="${line} time=\"${testRunningTime}\""
+    fi
+
+    if [ "$testResult" == "Pass" ]; then
+        line="${line}/>"
+        echo "$line" >>"$xunitTestOutputPath"
+        return
+    fi
+
+    line="${line}>"
+    echo "$line" >>"$xunitTestOutputPath"
+
+    line="        "
+    if [ "$testResult" == "Skip" ]; then
+        line="${line}<reason><![CDATA[$(cat "$outputFilePath")]]></reason>"
+        echo "$line" >>"$xunitTestOutputPath"
+    else
+        line="${line}<failure exception-type=\"Exit code: ${testScriptExitCode}\">"
+        echo "$line" >>"$xunitTestOutputPath"
+
+        line="          "
+        line="${line}<message>"
+        echo "$line" >>"$xunitTestOutputPath"
+        line="            "
+        line="${line}<![CDATA["
+        echo "$line" >>"$xunitTestOutputPath"
+        cat "$outputFilePath" >>"$xunitTestOutputPath"
+        line="            "
+        line="${line}]]>"
+        echo "$line" >>"$xunitTestOutputPath"
+        line="          "
+        line="${line}</message>"
+        echo "$line" >>"$xunitTestOutputPath"
+
+        line="        "
+        line="${line}</failure>"
+        echo "$line" >>"$xunitTestOutputPath"
+    fi
+
+    line="      "
+    line="${line}</test>"
+    echo "$line" >>"$xunitTestOutputPath"
+}
+
+function xunit_output_end {
+    local errorSource=$1
+    local errorMessage=$2
+
+    local errorCount
+    if [ -z "$errorSource" ]; then
+        ((errorCount = 0))
+    else
+        ((errorCount = 1))
+    fi
+
+    echo '<?xml version="1.0" encoding="utf-8"?>' >>"$xunitOutputPath"
+    echo '<assemblies>' >>"$xunitOutputPath"
+
+    local line
+
+    # <assembly ...>
+    line="  "
+    line="${line}<assembly"
+    line="${line} name=\"CoreClrTestAssembly\""
+    line="${line} total=\"${countTotalTests}\""
+    line="${line} passed=\"${countPassedTests}\""
+    line="${line} failed=\"${countFailedTests}\""
+    line="${line} skipped=\"${countSkippedTests}\""
+    line="${line} errors=\"${errorCount}\""
+    line="${line}>"
+    echo "$line" >>"$xunitOutputPath"
+
+    # <collection ...>
+    line="    "
+    line="${line}<collection"
+    line="${line} name=\"CoreClrTestCollection\""
+    line="${line} total=\"${countTotalTests}\""
+    line="${line} passed=\"${countPassedTests}\""
+    line="${line} failed=\"${countFailedTests}\""
+    line="${line} skipped=\"${countSkippedTests}\""
+    line="${line}>"
+    echo "$line" >>"$xunitOutputPath"
+
+    # <test .../> <test .../> ...
+    if [ -f "$xunitTestOutputPath" ]; then
+        cat "$xunitTestOutputPath" >>"$xunitOutputPath"
+        rm -f "$xunitTestOutputPath"
+    fi
+
+    # </collection>
+    line="    "
+    line="${line}</collection>"
+    echo "$line" >>"$xunitOutputPath"
+
+    if [ -n "$errorSource" ]; then
+        # <errors>
+        line="    "
+        line="${line}<errors>"
+        echo "$line" >>"$xunitOutputPath"
+
+        # <error ...>
+        line="      "
+        line="${line}<error"
+        line="${line} type=\"TestHarnessError\""
+        line="${line} name=\"${errorSource}\""
+        line="${line}>"
+        echo "$line" >>"$xunitOutputPath"
+
+        # <failure .../>
+        line="        "
+        line="${line}<failure>${errorMessage}</failure>"
+        echo "$line" >>"$xunitOutputPath"
+
+        # </error>
+        line="      "
+        line="${line}</error>"
+        echo "$line" >>"$xunitOutputPath"
+
+        # </errors>
+        line="    "
+        line="${line}</errors>"
+        echo "$line" >>"$xunitOutputPath"
+    fi
+
+    # </assembly>
+    line="  "
+    line="${line}</assembly>"
+    echo "$line" >>"$xunitOutputPath"
+
+    # </assemblies>
+    echo '</assemblies>' >>"$xunitOutputPath"
+}
+
+function text_file_output_begin {
+    if [ -z "$testsPassOutputPath" ]; then
+        testsPassOutputPath=$testRootDir/coreclrtests.pass.txt
+    fi
+    if ! [ -e $(basename "$testsPassOutputPath") ]; then
+        testsPassOutputPath=$testRootDir/coreclrtests.pass.txt
+    fi
+    if [ -e "$testsPassOutputPath" ]; then
+        rm -f "$testsPassOutputPath"
+    fi
+    if [ -z "$testsFailOutputPath" ]; then
+        testsFailOutputPath=$testRootDir/coreclrtests.fail.txt
+    fi
+    if ! [ -e $(basename "$testsFailOutputPath") ]; then
+        testsFailOutputPath=$testRootDir/coreclrtests.fail.txt
+    fi
+    if [ -e "$testsFailOutputPath" ]; then
+        rm -f "$testsFailOutputPath"
+    fi
+    if [ -z "$testsSkipOutputPath" ]; then
+        testsSkipOutputPath=$testRootDir/coreclrtests.skip.txt
+    fi
+    if ! [ -e $(basename "$testsSkipOutputPath") ]; then
+        testsSkipOutputPath=$testRootDir/coreclrtests.skip.txt
+    fi
+    if [ -e "$testsSkipOutputPath" ]; then
+        rm -f "$testsSkipOutputPath"
+    fi
+}
+
+function text_file_output_add_test {
+    local scriptFilePath=$1
+    local testResult=$2 # Pass, Fail, or Skip
+
+    if [ "$testResult" == "Pass" ]; then
+        echo "$scriptFilePath" >>"$testsPassOutputPath"
+    elif [ "$testResult" == "Skip" ]; then
+        echo "$scriptFilePath" >>"$testsSkipOutputPath"
+    else
+        echo "$scriptFilePath" >>"$testsFailOutputPath"
+    fi
+}
+
+function exit_with_error {
+    local errorSource=$1
+    local errorMessage=$2
+    local printUsage=$3
+
+    if [ -z "$printUsage" ]; then
+        ((printUsage = 0))
+    fi
+
+    echo "$errorMessage"
+    xunit_output_end "$errorSource" "$errorMessage"
+    if ((printUsage != 0)); then
+        print_usage
+    fi
+    exit $EXIT_CODE_EXCEPTION
+}
+
+# Handle Ctrl-C. We will stop execution and print the results that
+# we gathered so far.
+function handle_ctrl_c {
+    local errorSource='handle_ctrl_c'
+
+    echo ""
+    echo "*** Stopping... ***"
+    print_results
+    exit_with_error "$errorSource" "Test run aborted by Ctrl+C."
+}
+
+# Register the Ctrl-C handler
+trap handle_ctrl_c INT
+
+function create_core_overlay {
+    local errorSource='create_core_overlay'
+    local printUsage=1
+
+    if [ -n "$coreOverlayDir" ]; then
+        export CORE_ROOT="$coreOverlayDir"
+
+        if [ -n "$copyNativeTestBin" ]; then
+            copy_test_native_bin_to_test_root $coreOverlayDir
+        fi
+
+        return
+    fi
+
+    # Check inputs to make sure we have enough information to create the core layout. $testRootDir/Tests/Core_Root should
+    # already exist and contain test dependencies that are not built.
+    local testDependenciesDir=$testRootDir/Tests/Core_Root
+    if [ ! -d "$testDependenciesDir" ]; then
+        exit_with_error "$errorSource" "Did not find the test dependencies directory: $testDependenciesDir"
+    fi
+    if [ -z "$coreClrBinDir" ]; then
+        exit_with_error "$errorSource" "One of --coreOverlayDir or --coreClrBinDir must be specified." "$printUsage"
+    fi
+    if [ ! -d "$coreClrBinDir" ]; then
+        exit_with_error "$errorSource" "Directory specified by --coreClrBinDir does not exist: $coreClrBinDir"
+    fi
+
+    # Create the overlay
+    coreOverlayDir=$testRootDir/Tests/coreoverlay
+    export CORE_ROOT="$coreOverlayDir"
+    if [ -e "$coreOverlayDir" ]; then
+        rm -f -r "$coreOverlayDir"
+    fi
+    mkdir "$coreOverlayDir"
+
+    cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null
+    cp -f -p -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
+    if [ -d "$mscorlibDir/bin" ]; then
+        cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null
+    fi
+    cp -f -v "$testDependenciesDir/"xunit* "$coreOverlayDir/" 2>/dev/null
+    cp -n -v "$testDependenciesDir/"* "$coreOverlayDir/" 2>/dev/null
+    if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then
+        # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows
+        rm -f "$coreOverlayDir/mscorlib.ni.dll"
+    fi
+    if [ -f "$coreOverlayDir/System.Private.CoreLib.ni.dll" ]; then
+        # Test dependencies come from a Windows build, and System.Private.CoreLib.ni.dll would be the one from Windows
+        rm -f "$coreOverlayDir/System.Private.CoreLib.ni.dll"
+    fi
+    copy_test_native_bin_to_test_root $coreOverlayDir
+}
+
+function create_testhost
+{
+    if [ ! -d "$testHostDir" ]; then
+        exit_with_error "$errorSource" "Did not find the test host directory: $testHostDir"
+    fi
+
+    # Initialize test variables
+    local buildToolsDir=$coreClrSrc/Tools
+    local dotnetExe=$buildToolsDir/dotnetcli/dotnet
+    local coreClrSrcTestDir=$coreClrSrc/tests
+    
+    if [ -z $coreClrBinDir ]; then
+        local coreClrBinDir=${coreClrSrc}/bin
+        export __CoreFXTestDir=${coreClrSrc}/bin/tests/CoreFX
+    else
+        export __CoreFXTestDir=${coreClrBinDir}/tests/CoreFX    
+    fi
+
+    local coreFXTestSetupUtilityName=CoreFX.TestUtils.TestFileSetup
+    local coreFXTestSetupUtility="${coreClrSrcTestDir}/src/Common/CoreFX/TestFileSetup/${coreFXTestSetupUtilityName}.csproj"
+    local coreFXTestSetupUtilityOutputPath=${__CoreFXTestDir}/TestUtilities
+    local coreFXTestBinariesOutputPath=${__CoreFXTestDir}/tests_downloaded
+    
+    if [ -z $CoreFXTestList]; then
+        local CoreFXTestList="${coreClrSrcTestDir}/CoreFX/CoreFX.issues.json"
+    fi
+
+    case "${OSName}" in
+        # Check if we're running under OSX        
+        Darwin)
+            local coreFXTestRemoteURL=$(<${coreClrSrcTestDir}/CoreFX/CoreFXTestListURL_OSX.txt)
+            local coreFXTestExclusionDef=nonosxtests
+        ;;        
+        # Default to Linux        
+        *)
+            local coreFXTestRemoteURL=$(<${coreClrSrcTestDir}/CoreFX/CoreFXTestListURL_Linux.txt)
+            local coreFXTestExclusionDef=nonlinuxtests
+        ;;
+    esac
+
+    local coreFXTestExecutable=xunit.console.netcore.exe
+    local coreFXLogDir=${coreClrBinDir}/Logs/CoreFX/
+    local coreFXTestExecutableArgs="--notrait category=nonnetcoreapptests --notrait category=${coreFXTestExclusionDef} --notrait category=failing --notrait category=IgnoreForCI --notrait category=OuterLoop --notrait Benchmark=true"
+
+    chmod +x ${dotnetExe}
+    resetCommandArgs=("msbuild /t:Restore ${coreFXTestSetupUtility}")
+    echo "${dotnetExe} $resetCommandArgs"
+    "${dotnetExe}" $resetCommandArgs
+
+    buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:Configuration=Release")
+    echo "${dotnetExe} $buildCommandArgs"
+    "${dotnetExe}" $buildCommandArgs
+    
+    if [ "${RunCoreFXTestsAll}" == "1" ]; then
+        local coreFXRunCommand=--runAllTests
+    else
+        local coreFXRunCommand=--runSpecifiedTests
+    fi
+
+    local buildTestSetupUtilArgs=("${coreFXTestSetupUtilityOutputPath}/${coreFXTestSetupUtilityName}.dll --clean --outputDirectory ${coreFXTestBinariesOutputPath} --testListJsonPath ${CoreFXTestList} ${coreFXRunCommand} --dotnetPath ${testHostDir}/dotnet --testUrl ${coreFXTestRemoteURL} --executable ${coreFXTestExecutable} --log ${coreFXLogDir} ${coreFXTestExecutableArgs}")
+    echo "${dotnetExe} $buildTestSetupUtilArgs"
+    "${dotnetExe}" $buildTestSetupUtilArgs
+
+    local exitCode=$?
+    if [ $exitCode != 0 ]; then
+        echo Running CoreFX tests finished with failures
+    else
+        echo Running CoreFX tests finished successfully
+    fi    
+    
+    echo Check ${coreFXLogDir} for test run logs
+
+    exit ${exitCode}
+}
+
+declare -a skipCrossGenFiles
+
+function is_skip_crossgen_test {
+    for skip in "${skipCrossGenFiles[@]}"; do
+        if [ "$1" == "$skip" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+function precompile_overlay_assemblies {
+    skipCrossGenFiles=($(read_array "$(dirname "$0")/skipCrossGenFiles.$ARCH.txt"))
+
+    if [ $doCrossgen == 1 ]; then
+        local overlayDir=$CORE_ROOT
+
+        filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -type f )
+        for fileToPrecompile in ${filesToPrecompile}
+        do
+            local filename=${fileToPrecompile}
+            if [ $jitdisasm == 1 ]; then
+                $overlayDir/corerun $overlayDir/jit-dasm.dll --crossgen $overlayDir/crossgen --platform $overlayDir --output $testRootDir/dasm $filename
+                local exitCode=$?
+                if [ $exitCode != 0 ]; then
+                    echo Unable to generate dasm for $filename
+                fi
+            else
+                if is_skip_crossgen_test "$(basename $filename)"; then
+                    continue
+                fi
+                echo Precompiling $filename
+                $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 1> $filename.stdout 2>$filename.stderr
+                local exitCode=$?
+                if [[ $exitCode != 0 ]]; then
+                    if grep -q -e '0x80131018' $filename.stderr; then
+                        printf "\n\t$filename is not a managed assembly.\n\n"
+                    else
+                        echo Unable to precompile $filename.
+                        cat $filename.stdout
+                        cat $filename.stderr
+                        exit $exitCode
+                    fi
+                else
+                    rm $filename.{stdout,stderr}
+                fi
+            fi
+        done
+    else
+        echo Skipping crossgen of FX assemblies.
+    fi
+}
+
+function copy_test_native_bin_to_test_root {
+    local errorSource='copy_test_native_bin_to_test_root'
+    local coreRootDir=$1
+
+    if [ -z "$testNativeBinDir" ]; then
+        exit_with_error "$errorSource" "--testNativeBinDir is required."
+    fi
+    testNativeBinDir=$testNativeBinDir/src
+    if [ ! -d "$testNativeBinDir" ]; then
+        exit_with_error "$errorSource" "Directory specified by --testNativeBinDir does not exist: $testNativeBinDir"
+    fi
+
+    # Copy native test components from the native test build into the respective test directory in the test root directory
+    find "$testNativeBinDir" -type f -iname "*.$libExtension" |
+        while IFS='' read -r filePath || [ -n "$filePath" ]; do
+            local dirPath=$(dirname "$filePath")
+            cp -f "$filePath" "$coreRootDir"
+        done
+}
+
+# Variables for unsupported and failing tests
+declare -a unsupportedTests
+declare -a failingTests
+declare -a playlistTests
+((runFailingTestsOnly = 0))
+
+# Get an array of items by reading the specified file line by line.
+function read_array {
+    local theArray=()
+
+    if [ ! -f "$1" ]; then
+        return
+    fi
+
+    # bash in Mac OS X doesn't support 'readarray', so using alternate way instead.
+    # readarray -t theArray < "$1"
+    # Any line that starts with '#' is ignored.
+    while IFS='' read -r line || [ -n "$line" ]; do
+        if [[ $line != "#"* ]]; then
+            theArray[${#theArray[@]}]=$line
+        fi
+    done < "$1"
+    echo ${theArray[@]}
+}
+
+function load_unsupported_tests {
+    # Load the list of tests that are not supported on this platform. These tests are disabled (skipped) permanently.
+    unsupportedTests=($(read_array "$(dirname "$0")/testsUnsupportedOutsideWindows.txt"))
+    unsupportedTests+=($(read_array "$(dirname "$0")/testsUnsupported.$ARCH.txt"))
+}
+
+function load_failing_tests {
+    # Load the list of tests that fail on this platform. These tests are disabled (skipped) temporarily, pending investigation.
+    failingTests=($(read_array "$(dirname "$0")/testsFailingOutsideWindows.txt"))
+    failingTests+=($(read_array "$(dirname "$0")/testsFailing.$ARCH.txt"))
+}
+
+function load_playlist_tests {
+    # Load the list of tests that are enabled as a part of this test playlist.
+    playlistTests=($(read_array "${playlistFile}"))
+}
+
+function is_unsupported_test {
+    for unsupportedTest in "${unsupportedTests[@]}"; do
+        if [ "$1" == "$unsupportedTest" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+function is_failing_test {
+    for failingTest in "${failingTests[@]}"; do
+        if [ "$1" == "$failingTest" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+function is_playlist_test {
+    for playlistTest in "${playlistTests[@]}"; do
+        if [ "$1" == "$playlistTest" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+function skip_unsupported_test {
+    # This function runs in a background process. It should not echo anything, and should not use global variables. This
+    # function is analogous to run_test, and causes the test to be skipped with the message below.
+
+    local scriptFilePath=$1
+    local outputFilePath=$2
+
+    echo "Not supported on this platform." >"$outputFilePath"
+    return 2 # skip the test
+}
+
+function skip_failing_test {
+    # This function runs in a background process. It should not echo anything, and should not use global variables. This
+    # function is analogous to run_test, and causes the test to be skipped with the message below.
+
+    local scriptFilePath=$1
+    local outputFilePath=$2
+
+    echo "Temporarily disabled on this platform due to unexpected failures." >"$outputFilePath"
+    return 2 # skip the test
+}
+
+function skip_non_playlist_test {
+    # This function runs in a background process. It should not echo anything, and should not use global variables. This
+    # function is analogous to run_test, and causes the test to be skipped with the message below.
+
+    local scriptFilePath=$1
+    local outputFilePath=$2
+
+    echo "Test is not included in the running playlist." >"$outputFilePath"
+    return 2 # skip the test
+}
+
+function set_up_core_dump_generation {
+    # We will only enable dump generation here if we're on Mac or Linux
+    if [[ ! ( "$(uname -s)" == "Darwin" || "$(uname -s)" == "Linux" ) ]]; then
+        return
+    fi
+
+    # We won't enable dump generation on OS X/macOS if the machine hasn't been
+    # configured with the kern.corefile pattern we expect.
+    if [[ ( "$(uname -s)" == "Darwin" && "$(sysctl -n kern.corefile)" != "core.%P" ) ]]; then
+        echo "WARNING: Core dump generation not being enabled due to unexpected kern.corefile value."
+        return
+    fi
+
+    # Allow dump generation
+    ulimit -c unlimited
+
+    if [ "$(uname -s)" == "Linux" ]; then
+        if [ -e /proc/self/coredump_filter ]; then
+            # Include memory in private and shared file-backed mappings in the dump.
+            # This ensures that we can see disassembly from our shared libraries when
+            # inspecting the contents of the dump. See 'man core' for details.
+            echo 0x3F > /proc/self/coredump_filter
+        fi
+    fi
+}
+
+function print_info_from_core_file {
+
+    #### temporary
+    if [ "$ARCH" == "arm64" ]; then
+        echo "Not inspecting core dumps on arm64 at the moment."
+        return
+    fi
+    ####
+
+    local core_file_name=$1
+    local executable_name=$2
+
+    if ! [ -e $executable_name ]; then
+        echo "Unable to find executable $executable_name"
+        return
+    elif ! [ -e $core_file_name ]; then
+        echo "Unable to find core file $core_file_name"
+        return
+    fi
+
+    # Use LLDB to inspect the core dump on Mac, and GDB everywhere else.
+    if [[ "$OSName" == "Darwin" ]]; then
+        hash lldb 2>/dev/null || { echo >&2 "LLDB was not found. Unable to print core file."; return; }
+
+        echo "Printing info from core file $core_file_name"
+        lldb -c $core_file_name -b -o 'bt'
+    else
+        # Use GDB to print the backtrace from the core file.
+        hash gdb 2>/dev/null || { echo >&2 "GDB was not found. Unable to print core file."; return; }
+
+        echo "Printing info from core file $core_file_name"
+        gdb --batch -ex "thread apply all bt full" -ex "quit" $executable_name $core_file_name
+    fi
+}
+
+function download_dumpling_script {
+    echo "Downloading latest version of dumpling script."
+    wget "https://dumpling.azurewebsites.net/api/client/dumpling.py"
+
+    local dumpling_script="dumpling.py"
+    chmod +x $dumpling_script
+}
+
+function upload_core_file_to_dumpling {
+    local core_file_name=$1
+    local dumpling_script="dumpling.py"
+    local dumpling_file="local_dumplings.txt"
+
+    # dumpling requires that the file exist before appending.
+    touch ./$dumpling_file
+
+    if [ ! -x $dumpling_script ]; then
+        download_dumpling_script
+    fi
+
+    if [ ! -x $dumpling_script ]; then
+        echo "Failed to download dumpling script. Dump cannot be uploaded."
+        return
+    fi
+
+    echo "Uploading $core_file_name to dumpling service."
+
+    local paths_to_add=""
+    if [ -d "$coreClrBinDir" ]; then
+        echo "Uploading CoreCLR binaries with dump."
+        paths_to_add=$coreClrBinDir
+    fi
+
+    # Ensure the script has Unix line endings
+    perl -pi -e 's/\r\n|\n|\r/\n/g' "$dumpling_script"
+
+    # The output from this will include a unique ID for this dump.
+    ./$dumpling_script "upload" "--dumppath" "$core_file_name" "--incpaths" $paths_to_add "--properties" "Project=CoreCLR" "--squelch" | tee -a $dumpling_file
+}
+
+function preserve_core_file {
+    local core_file_name=$1
+    local storage_location="/tmp/coredumps_coreclr"
+
+    # Create the directory (this shouldn't fail even if it already exists).
+    mkdir -p $storage_location
+
+    # Only preserve the dump if the directory is empty. Otherwise, do nothing.
+    # This is a way to prevent us from storing/uploading too many dumps.
+    if [ ! "$(ls -A $storage_location)" ]; then
+        echo "Copying core file $core_file_name to $storage_location"
+        cp $core_file_name $storage_location
+
+        upload_core_file_to_dumpling $core_file_name
+    fi
+}
+
+function inspect_and_delete_core_files {
+    # This function prints some basic information from core files in the current
+    # directory and deletes them immediately. Based on the state of the system, it may
+    # also upload a core file to the dumpling service.
+    # (see preserve_core_file).
+    
+    # Depending on distro/configuration, the core files may either be named "core"
+    # or "core.<PID>" by default. We will read /proc/sys/kernel/core_uses_pid to 
+    # determine which one it is.
+    # On OS X/macOS, we checked the kern.corefile value before enabling core dump
+    # generation, so we know it always includes the PID.
+    local core_name_uses_pid=0
+    if [[ (( -e /proc/sys/kernel/core_uses_pid ) && ( "1" == $(cat /proc/sys/kernel/core_uses_pid) )) 
+          || ( "$(uname -s)" == "Darwin" ) ]]; then
+        core_name_uses_pid=1
+    fi
+
+    if [ $core_name_uses_pid == "1" ]; then
+        # We don't know what the PID of the process was, so let's look at all core
+        # files whose name matches core.NUMBER
+        for f in core.*; do
+            [[ $f =~ core.[0-9]+ ]] && print_info_from_core_file "$f" $CORE_ROOT/"corerun" && preserve_core_file "$f" && rm "$f"
+        done
+    elif [ -f core ]; then
+        print_info_from_core_file "core" $CORE_ROOT/"corerun"
+        preserve_core_file "core"
+        rm "core"
+    fi
+}
+
+function run_test {
+    # This function runs in a background process. It should not echo anything, and should not use global variables.
+
+    local scriptFilePath=$1
+    local outputFilePath=$2
+
+    # Switch to directory where the script is
+    cd "$(dirname "$scriptFilePath")"
+
+    local scriptFileName=$(basename "$scriptFilePath")
+    local outputFileName=$(basename "$outputFilePath")
+
+    if [ "$limitedCoreDumps" == "ON" ]; then
+        set_up_core_dump_generation
+    fi
+
+    "./$scriptFileName" >"$outputFileName" 2>&1
+    local testScriptExitCode=$?
+
+    # We will try to print some information from generated core dumps if a debugger
+    # is available, and possibly store a dump in a non-transient location.
+    if [ "$limitedCoreDumps" == "ON" ]; then
+        inspect_and_delete_core_files
+    fi
+
+    return $testScriptExitCode
+}
+
+# Variables for running tests in the background
+if [ `uname` = "NetBSD" ]; then
+    NumProc=$(getconf NPROCESSORS_ONLN)
+elif [ `uname` = "Darwin" ]; then
+    NumProc=$(getconf _NPROCESSORS_ONLN)
+else
+    if [ -x "$(command -v nproc)" ]; then
+        NumProc=$(nproc --all)
+    elif [ -x "$(command -v getconf)" ]; then
+        NumProc=$(getconf _NPROCESSORS_ONLN)
+    else
+        NumProc=1
+    fi
+fi
+((maxProcesses = $NumProc * 3 / 2)) # long tests delay process creation, use a few more processors
+
+((processCount = 0))
+declare -a scriptFilePaths
+declare -a outputFilePaths
+declare -a processIds
+declare -a testStartTimes
+waitProcessIndex=
+pidNone=0
+
+function waitany {
+    local pid
+    local exitcode
+    while true; do
+        for (( i=0; i<$maxProcesses; i++ )); do
+            pid=${processIds[$i]}
+            if [ -z "$pid" ] || [ "$pid" == "$pidNone" ]; then
+                continue
+            fi
+            if ! kill -0 $pid 2>/dev/null; then
+                wait $pid
+                exitcode=$?
+                waitProcessIndex=$i
+                processIds[$i]=$pidNone
+                return $exitcode
+            fi
+        done
+        sleep 0.1
+    done
+}
+
+function get_available_process_index {
+    local pid
+    local i=0
+    for (( i=0; i<$maxProcesses; i++ )); do
+        pid=${processIds[$i]}
+        if [ -z "$pid" ] || [ "$pid" == "$pidNone" ]; then
+            break
+        fi
+    done
+    echo $i
+}
+
+function finish_test {
+    waitany
+    local testScriptExitCode=$?
+    local finishedProcessIndex=$waitProcessIndex
+    ((--processCount))
+
+    local scriptFilePath=${scriptFilePaths[$finishedProcessIndex]}
+    local outputFilePath=${outputFilePaths[$finishedProcessIndex]}
+    local scriptFileName=$(basename "$scriptFilePath")
+
+    local testEndTime=
+    local testRunningTime=
+    local header=
+
+    if ((verbose == 1)); then
+        header=$(printf "[%4d]" $countTotalTests)
+    fi
+
+    if [ "$showTime" == "ON" ]; then
+        testEndTime=$(date +%s)
+        testRunningTime=$(( $testEndTime - ${testStartTimes[$finishedProcessIndex]} ))
+        header=$header$(printf "[%4ds]" $testRunningTime)
+    fi
+
+    local testResult
+    case $testScriptExitCode in
+        0)
+            let countPassedTests++
+            testResult='Pass'
+            if ((verbose == 1 || runFailingTestsOnly == 1)); then
+                echo "PASSED   - ${header}${scriptFilePath}"
+            else
+                echo "         - ${header}${scriptFilePath}"
+            fi
+            ;;
+        2)
+            let countSkippedTests++
+            testResult='Skip'
+            echo "SKIPPED  - ${header}${scriptFilePath}"
+            ;;
+        *)
+            let countFailedTests++
+            testResult='Fail'
+            echo "FAILED   - ${header}${scriptFilePath}"
+            ;;
+    esac
+    let countTotalTests++
+
+    if ((verbose == 1 || testScriptExitCode != 0)); then
+        while IFS='' read -r line || [ -n "$line" ]; do
+            echo "               $line"
+        done <"$outputFilePath"
+    fi
+
+    xunit_output_add_test "$scriptFilePath" "$outputFilePath" "$testResult" "$testScriptExitCode" "$testRunningTime"
+    text_file_output_add_test "$scriptFilePath" "$testResult"
+}
+
+function finish_remaining_tests {
+    # Finish the remaining tests in the order in which they were started
+    while ((processCount > 0)); do
+        finish_test
+    done
+}
+
+function prep_test {
+    local scriptFilePath=$1
+    local scriptFileDir=$(dirname "$scriptFilePath")
+
+    test "$verbose" == 1 && echo "Preparing $scriptFilePath"
+
+    if [ ! "$noLFConversion" == "ON" ]; then
+        # Convert DOS line endings to Unix if needed
+        perl -pi -e 's/\r\n|\n|\r/\n/g' "$scriptFilePath"
+    fi
+        
+    # Add executable file mode bit if needed
+    chmod +x "$scriptFilePath"
+
+    #remove any NI and Locks
+    rm -f $scriptFileDir/*.ni.*
+    rm -rf $scriptFileDir/lock
+}
+
+function start_test {
+    local nextProcessIndex=$(get_available_process_index)
+    local scriptFilePath=$1
+    if ((runFailingTestsOnly == 1)) && ! is_failing_test "$scriptFilePath"; then
+        return
+    fi
+
+    # Skip any test that's not in the current playlist, if a playlist was
+    # given to us.
+    if [ -n "$playlistFile" ] && ! is_playlist_test "$scriptFilePath"; then
+        return
+    fi
+
+    if ((nextProcessIndex == maxProcesses)); then
+        finish_test
+        nextProcessIndex=$(get_available_process_index)
+    fi
+
+    scriptFilePaths[$nextProcessIndex]=$scriptFilePath
+    local scriptFileName=$(basename "$scriptFilePath")
+    local outputFilePath=$(dirname "$scriptFilePath")/${scriptFileName}.out
+    outputFilePaths[$nextProcessIndex]=$outputFilePath
+
+    if [ "$showTime" == "ON" ]; then
+        testStartTimes[$nextProcessIndex]=$(date +%s)
+    fi
+
+    test "$verbose" == 1 && echo "Starting $scriptFilePath"
+    if is_unsupported_test "$scriptFilePath"; then
+        skip_unsupported_test "$scriptFilePath" "$outputFilePath" &
+    elif ((runFailingTestsOnly == 0)) && is_failing_test "$scriptFilePath"; then
+        skip_failing_test "$scriptFilePath" "$outputFilePath" &
+    else
+        run_test "$scriptFilePath" "$outputFilePath" &
+    fi
+    processIds[$nextProcessIndex]=$!
+
+    ((++processCount))
+}
+
+# Get a list of directories in which to scan for tests by reading the
+# specified file line by line.
+function set_test_directories {
+    local errorSource='set_test_directories'
+
+    local listFileName=$1
+
+    if [ ! -f "$listFileName" ]
+    then
+        exit_with_error "$errorSource" "Test directories file not found at $listFileName"
+    fi
+    testDirectories=($(read_array "$listFileName"))
+}
+
+function run_tests_in_directory {
+    local testDir=$1
+
+    # Recursively search through directories for .sh files to prepare them.
+    # Note: This needs to occur before any test runs as some of the .sh files
+    # depend on other .sh files
+    for scriptFilePath in $(find "$testDir" -type f -iname '*.sh' | sort)
+    do
+        prep_test "${scriptFilePath:2}"
+    done
+    echo "The tests have been prepared"
+    # Recursively search through directories for .sh files to run.
+    for scriptFilePath in $(find "$testDir" -type f -iname '*.sh' | sort)
+    do
+        start_test "${scriptFilePath:2}"
+    done
+}
+
+function coreclr_code_coverage {
+    local coverageDir="$coverageOutputDir/Coverage"
+    local toolsDir="$coverageOutputDir/Coverage/tools"
+    local reportsDir="$coverageOutputDir/Coverage/reports"
+    local packageName="unix-code-coverage-tools.1.0.0.nupkg"
+
+    rm -rf $coverageDir
+    mkdir -p $coverageDir
+    mkdir -p $toolsDir
+    mkdir -p $reportsDir
+    pushd $toolsDir > /dev/null
+
+    echo "Pulling down code coverage tools"
+    wget -q https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0 -O $packageName
+    echo "Unzipping to $toolsDir"
+    unzip -q -o $packageName
+
+    # Invoke gcovr
+    chmod a+rwx ./gcovr
+    chmod a+rwx ./$OSName/llvm-cov
+
+    echo
+    echo "Generating coreclr code coverage reports at $reportsDir/coreclr.html"
+    echo "./gcovr $coreClrObjs --gcov-executable=$toolsDir/$OS/llvm-cov -r $coreClrSrc --html --html-details -o $reportsDir/coreclr.html"
+    echo
+    ./gcovr $coreClrObjs --gcov-executable=$toolsDir/$OSName/llvm-cov -r $coreClrSrc --html --html-details -o $reportsDir/coreclr.html
+    exitCode=$?
+    popd > /dev/null
+    exit $exitCode
+}
+
+function check_cpu_architecture {
+    local CPUName=$(uname -m)
+    local __arch=
+
+    case $CPUName in
+        i686)
+            __arch=x86
+            ;;
+        x86_64)
+            __arch=x64
+            ;;
+        armv7l)
+            __arch=arm
+            ;;
+        aarch64)
+            __arch=arm64
+            ;;
+        *)
+            echo "Unknown CPU $CPUName detected, configuring as if for x64"
+            __arch=x64
+            ;;
+    esac
+
+    echo "$__arch"
+}
+
+ARCH=$(check_cpu_architecture)
+echo "Running on  CPU- $ARCH"
+
+# Exit code constants
+readonly EXIT_CODE_SUCCESS=0       # Script ran normally.
+readonly EXIT_CODE_EXCEPTION=1     # Script exited because something exceptional happened (e.g. bad arguments, Ctrl-C interrupt).
+readonly EXIT_CODE_TEST_FAILURE=2  # Script completed successfully, but one or more tests failed.
+
+# Argument variables
+testRootDir=
+testNativeBinDir=
+coreOverlayDir=
+coreClrBinDir=
+mscorlibDir=
+coreFxBinDir=
+coreClrObjs=
+coreClrSrc=
+coverageOutputDir=
+testEnv=
+playlistFile=
+showTime=
+noLFConversion=
+buildOverlayOnly=
+gcsimulator=
+longgc=
+limitedCoreDumps=
+illinker=
+((disableEventLogging = 0))
+((serverGC = 0))
+
+# Handle arguments
+verbose=0
+doCrossgen=0
+jitdisasm=0
+ilasmroundtrip=
+
+for i in "$@"
+do
+    case $i in
+        -h|--help)
+            print_usage
+            exit $EXIT_CODE_SUCCESS
+            ;;
+        -v|--verbose)
+            verbose=1
+            ;;
+        --crossgen)
+            doCrossgen=1
+            ;;
+        --jitstress=*)
+            export COMPlus_JitStress=${i#*=}
+            ;;
+        --jitstressregs=*)
+            export COMPlus_JitStressRegs=${i#*=}
+            ;;
+        --jitminopts)
+            export COMPlus_JITMinOpts=1
+            ;;
+        --copyNativeTestBin)
+            export copyNativeTestBin=1
+            ;;
+        --jitforcerelocs)
+            export COMPlus_ForceRelocs=1
+            ;;
+        --link=*)
+            export ILLINK=${i#*=}
+            export DoLink=true
+            ;;
+        --tieredcompilation)
+            export COMPlus_TieredCompilation=1
+            ;;
+        --jitdisasm)
+            jitdisasm=1
+            ;;
+        --ilasmroundtrip)
+            ((ilasmroundtrip = 1))
+            ;;
+        --testRootDir=*)
+            testRootDir=${i#*=}
+            ;;
+        --testNativeBinDir=*)
+            testNativeBinDir=${i#*=}
+            ;;
+        --coreOverlayDir=*)
+            coreOverlayDir=${i#*=}
+            ;;
+        --coreClrBinDir=*)
+            coreClrBinDir=${i#*=}
+            ;;
+        --mscorlibDir=*)
+            mscorlibDir=${i#*=}
+            ;;
+        --coreFxBinDir=*)
+            coreFxBinDir=${i#*=}
+            ;;
+        --testDir=*)
+            testDirectories[${#testDirectories[@]}]=${i#*=}
+            ;;
+        --testDirFile=*)
+            set_test_directories "${i#*=}"
+            ;;
+        --runFailingTestsOnly)
+            ((runFailingTestsOnly = 1))
+            ;;
+        --disableEventLogging)
+            ((disableEventLogging = 1))
+            ;;
+        --runcrossgentests)
+            export RunCrossGen=1
+            ;;
+        --corefxtests)
+            export RunCoreFXTests=1
+            ;;
+        --corefxtestsall)
+            export RunCoreFXTests=1
+            export RunCoreFXTestsAll=1
+            ;;
+        --corefxtestlist)
+            export RunCoreFXTests=1
+            export CoreFXTestList=${i#*=} 
+            ;;
+        --testHostDir=*)
+            export testHostDir=${i#*=}
+            ;;
+        --sequential)
+            ((maxProcesses = 1))
+            ;;
+        --useServerGC)
+            ((serverGC = 1))
+            ;;
+        --long-gc)
+            ((longgc = 1))
+            ;;
+        --gcsimulator)
+            ((gcsimulator = 1))
+            ;;
+        --playlist=*)
+            playlistFile=${i#*=}
+            ;;
+        --coreclr-coverage)
+            CoreClrCoverage=ON
+            ;;
+        --coreclr-objs=*)
+            coreClrObjs=${i#*=}
+            ;;
+        --coreclr-src=*)
+            coreClrSrc=${i#*=}
+            ;;
+        --coverage-output-dir=*)
+            coverageOutputDir=${i#*=}
+            ;;
+        --test-env=*)
+            testEnv=${i#*=}
+            ;;            
+        --gcstresslevel=*)
+            export COMPlus_GCStress=${i#*=}
+            ;;            
+        --gcname=*)
+            export COMPlus_GCName=${i#*=}
+            ;;
+        --show-time)
+            showTime=ON
+            ;;
+        --no-lf-conversion)
+            noLFConversion=ON
+            ;;
+        --build-overlay-only)
+            buildOverlayOnly=ON
+            ;;
+        --limitedDumpGeneration)
+            limitedCoreDumps=ON
+            ;;
+        --xunitOutputPath=*)
+            xunitOutputPath=${i#*=}
+            ;;
+        *)
+            echo "Unknown switch: $i"
+            print_usage
+            exit $EXIT_CODE_SUCCESS
+            ;;
+    esac
+done
+
+if [ -n "$coreOverlayDir" ] && [ "$buildOverlayOnly" == "ON" ]; then
+    echo "Can not use \'--coreOverlayDir=<path>\' and \'--build-overlay-only\' at the same time."
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if ((disableEventLogging == 0)); then
+    export COMPlus_EnableEventLog=1
+fi
+
+export COMPlus_gcServer="$serverGC"
+
+if [ "$RunCoreFXTests" == 1 ];
+then 
+    if [ -z "$coreClrSrc" ]
+    then
+        echo "Coreclr src files are required to run CoreFX tests"
+        echo "Coreclr src files root path can be passed using '--coreclr-src' argument"
+        print_usage
+        exit $EXIT_CODE_EXCEPTION
+    fi
+
+    if [ -z "$testHostDir" ]; then
+        echo "--testHostDir is required to run CoreFX tests"
+        print_usage
+        exit $EXIT_CODE_EXCEPTION
+    fi
+    
+    if [ ! -f "$testHostDir/dotnet" ]; then
+        echo "Executable dotnet not found in $testHostDir"
+        exit $EXIT_CODE_EXCEPTION
+    fi
+
+    if [ ! -d "$testHostDir" ]; then
+        echo "Directory specified by --testHostDir does not exist: $testRootDir"
+        exit $EXIT_CODE_EXCEPTION
+    fi
+
+    create_testhost
+    exit 0
+fi
+
+if [ -z "$testRootDir" ]; then
+    echo "--testRootDir is required."
+    print_usage
+    exit $EXIT_CODE_EXCEPTION
+fi
+if [ ! -d "$testRootDir" ]; then
+    echo "Directory specified by --testRootDir does not exist: $testRootDir"
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+# Copy native interop test libraries over to the mscorlib path in
+# order for interop tests to run on linux.
+if [ -z "$mscorlibDir" ]; then
+    mscorlibDir=$coreClrBinDir
+fi
+
+if [ ! -z "$longgc" ]; then
+    echo "Running Long GC tests"
+    export RunningLongGCTests=1
+fi
+
+if [ ! -z "$gcsimulator" ]; then
+    echo "Running GC simulator tests"
+    export RunningGCSimulatorTests=1
+fi
+
+if [[ ! "$jitdisasm" -eq 0 ]]; then
+    echo "Running jit disasm"
+    export RunningJitDisasm=1
+fi
+
+if [ ! -z "$ilasmroundtrip" ]; then
+    echo "Running Ilasm round trip"
+    export RunningIlasmRoundTrip=1
+fi
+
+# If this is a coverage run, make sure the appropriate args have been passed
+if [ "$CoreClrCoverage" == "ON" ]
+then
+    echo "Code coverage is enabled for this run"
+    echo ""
+    if [ ! "$OSName" == "Darwin" ] && [ ! "$OSName" == "Linux" ]
+    then
+        echo "Code Coverage not supported on $OS"
+        exit 1
+    fi
+
+    if [ -z "$coreClrObjs" ]
+    then
+        echo "Coreclr obj files are required to generate code coverage reports"
+        echo "Coreclr obj files root path can be passed using '--coreclr-obj' argument"
+        exit 1
+    fi
+
+    if [ -z "$coreClrSrc" ]
+    then
+        echo "Coreclr src files are required to generate code coverage reports"
+        echo "Coreclr src files root path can be passed using '--coreclr-src' argument"
+        exit 1
+    fi
+
+    if [ -z "$coverageOutputDir" ]
+    then
+        echo "Output directory for coverage results must be specified"
+        echo "Output path can be specified '--coverage-output-dir' argument"
+        exit 1
+    fi
+fi
+
+xunit_output_begin
+text_file_output_begin
+create_core_overlay
+precompile_overlay_assemblies
+
+if [ "$buildOverlayOnly" == "ON" ];
+then
+    echo "Build overlay directory '$coreOverlayDir' complete."
+    exit 0
+fi
+
+if [ -n "$playlistFile" ]
+then
+    # Use a playlist file exclusively, if it was provided
+    echo "Executing playlist $playlistFile"
+    load_playlist_tests
+else
+    load_unsupported_tests
+    load_failing_tests
+fi
+
+# Other architectures are not supported yet.
+if [ "$ARCH" == "x64" ]
+then
+    scriptPath=$(dirname $0)
+    ${scriptPath}/setup-stress-dependencies.sh --outputDir=$coreOverlayDir
+elif [ "$ARCH" != "arm64" ] && [ "$ARCH" != "arm" ]; then
+    echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture."
+fi
+
+export __TestEnv=$testEnv
+
+cd "$testRootDir"
+
+dumplingsListPath="$testRootDir/dumplings.txt"
+
+# clean up any existing dumpling remnants from previous runs.
+rm -f "$dumplingsListPath"
+find $testRootDir -type f -name "local_dumplings.txt" -exec rm {} \;
+
+time_start=$(date +"%s")
+if [ -z "$testDirectories" ]
+then
+    # No test directories were specified, so run everything in the current
+    # directory and its subdirectories.
+    run_tests_in_directory "."
+else
+    # Otherwise, run all the tests in each specified test directory.
+    for testDir in "${testDirectories[@]}"
+    do
+        if [ ! -d "$testDir" ]; then
+            echo "Test directory does not exist: $testDir"
+        else
+            run_tests_in_directory "./$testDir"
+        fi
+    done
+fi
+finish_remaining_tests
+
+print_results
+
+find $testRootDir -type f -name "local_dumplings.txt" -exec cat {} \; > $dumplingsListPath
+
+if [ -s $dumplingsListPath ]; then
+    cat $dumplingsListPath
+else
+    rm $dumplingsListPath
+fi
+
+time_end=$(date +"%s")
+time_diff=$(($time_end-$time_start))
+echo "$(($time_diff / 60)) minutes and $(($time_diff % 60)) seconds taken to run CoreCLR tests."
+
+xunit_output_end
+
+if [ "$CoreClrCoverage" == "ON" ]
+then
+    coreclr_code_coverage
+fi
+
+if ((countFailedTests > 0)); then
+    exit $EXIT_CODE_TEST_FAILURE
+fi
+
+exit $EXIT_CODE_SUCCESS
diff --git a/tests/issues.targets b/tests/issues.targets
index aa379047df..afae5fc161 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -1,416 +1,636 @@
 <?xml version="1.0" ?>
 <Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <!-- All OS/Arch common excludes -->
     <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\271010\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Coverage/271010/**">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\smalloom\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Coverage/smalloom/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\BackgroundGC\foregroundgc\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/BackgroundGC/foregroundgc/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\LOHFragmentation\lohfragmentation\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/LOHFragmentation/lohfragmentation/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\SustainedLowLatency\scenario\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/SustainedLowLatency/scenario/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\finalizertest\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/Allocation/finalizertest/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\collect\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/collect/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\getgeneration\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/getgeneration/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\reregisterforfinalize\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/reregisterforfinalize/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Regressions\dev10bugs\536168\536168\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\BaseFinal\basefinal\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/BaseFinal/basefinal/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\doublinknoleak\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/DoublinkList/doublinknoleak/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\muldimjagary\muldimjagary\*">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/muldimjagary/muldimjagary/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall/*">
+            <Issue>15353</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r\ldelemnullarr1_il_r.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_11408/GitHub_11408/*">
+            <Issue>11408</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d\nonrefsdarr_il_d.cmd">
-            <Issue>4851</Issue>
+    </ItemGroup>
+
+    <!-- All Unix targets -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TargetsWindows)' != 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/paramthreadstart/ThreadStartString_1/*">
+            <Issue>18381</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr_il_r.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp/*">
+            <Issue>Issue building native components for the test.</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd">
-            <Issue>4849</Issue>
+    </ItemGroup>
+
+    <!-- Arm32 All OS -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'arm'">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic2\rva_rvastatic2.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall_v4/hijacking/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>      
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>        
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>        
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof32/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>        
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof64/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\extended\extended.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\overlap\overlap.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeArray1/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic1\rvastatic1.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/hugeSimpleExpr1/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic2\rvastatic2.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/HeapExpansion/pluggaps/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic3\rvastatic3.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/v2.0-beta2/460373/460373/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic4\rvastatic4.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/v2.0-beta1/149926/149926/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/v2.0-rtm/494226/494226/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/readytorun/r2rdump/R2RDumpTest/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/API/GC/GetAllocatedBytesForCurrentThread/*">
+            <Issue></Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer_i\_il_dbgpointer_i.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/HeapExpansion/bestfit-finalize/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer\_il_relpointer.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/v2.0-rtm/494226/494226/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/API/NoGCRegion/NoGC/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/LeakWheel/leakwheel/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd">
-            <Issue>2451</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/system/span/SlowTailCallArgs/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/rngchk/RngchkStress3/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/ServerModel/servermodel/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventsource/eventsourcetrace/eventsourcetrace/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/inducedgc/inducedgc/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd">
-            <Issue>4851</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/rundown/rundown/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd">
-            <Issue>2434</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/tracelogging/tracelogging/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd">
-            <Issue>2441</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/jittingstarted/JittingStarted/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\test-tls\test-tls.cmd">
-            <Issue>2441</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitintry/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd">
-            <Issue>2441</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitincatch/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd">
-            <Issue>2441</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/rngchk/ArrayWithThread_o/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd">
-            <Issue>2444</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd">
-            <Issue>2444</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitinroot/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd">
-            <Issue>2444</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/*">
+            <Issue>times out</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd">
-            <Issue>2444</Issue>
+    </ItemGroup>
+
+    <!-- Arm64 All OS -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'arm64'">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_359736/**">
+            <Issue>8648</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd">
-            <Issue>2445</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/hugeexpr1/hugeexpr1/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\GitHub_11408\GitHub_11408\GitHub_11408.cmd">
-            <Issue>11408</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeArray/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>      
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeArray1/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>        
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeField1/*">
+            <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\DefaultInterfaceMethods\constrainedcall\constrainedcall\*">
-            <Issue>15353</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeField2/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>        
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/string/StringFormat1/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/string/StringFormat2/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>        
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_590772/DevDiv_590772/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_605447/DevDiv_605447/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_590771/DevDiv_590771/*">
+            <Issue>needs triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\readytorun\r2rdump\R2RDumpTest\R2RDumpTest.cmd">
+            <Issue>19441</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612\*">
+    </ItemGroup>
+
+    <!-- Windows x64 specific excludes -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x64' and '$(TargetsWindows)' == 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612/*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest613\Generated613\*">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613/*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest614\Generated614\*">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest681\Generated681\*">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest682\Generated682\*">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\GitHub_18056\Bool_And_Op_cs_do\Bool_And_Op_cs_do.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_18056/Bool_And_Op_cs_do/*">
             <Issue>18056</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\varargs\varargsupport\varargsupport.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/varargs/varargsupport/*">
             <Issue>Varargs supported on this platform</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\varargs\varargsupport_r\varargsupport_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/varargs/varargsupport_r/*">
             <Issue>Varargs supported on this platform</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\Interop\COM\NETClients\Primitives\NETClientPrimitives\NETClientPrimitives.cmd">
             <Issue>19164</Issue>
         </ExcludeList>
-		<ExcludeList Include="$(XunitTestBinBase)\readytorun\r2rdump\R2RDumpTest\R2RDumpTest.cmd">
-            <Issue>19441</Issue>
-        </ExcludeList>
     </ItemGroup>
 
-    <!-- The following are x86 failures -->
-
-    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86'">
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\largeexceptiontest\largeexceptiontest.cmd">
+    <!-- Windows x86 specific excludes -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86' and '$(TargetsWindows)' == 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/Allocation/largeexceptiontest/*">
             <Issue>3392, test is useful to have because it can be run manually when making changes to the GC that can have effects in OOM scenarios, but not appropriate to run on our current test infrastructure.</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\gettotalmemory\gettotalmemory.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/gettotalmemory/*">
             <Issue>3392, test is useful to have because it can be run manually when making changes to the GC that can have effects in OOM scenarios, but not appropriate to run on our current test infrastructure.</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\keepalive\keepalive.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/keepalive/*">
             <Issue>3392, test is useful to have because it can be run manually when making changes to the GC that can have effects in OOM scenarios, but not appropriate to run on our current test infrastructure.</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\suppressfinalize\suppressfinalize.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/suppressfinalize/*">
             <Issue>3392, test is useful to have because it can be run manually when making changes to the GC that can have effects in OOM scenarios, but not appropriate to run on our current test infrastructure.</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Tailcall/TailcallVerifyWithPrefix/*">
             <Issue>2420. x86 JIT doesn't support implicit tail call optimization or tail. call pop ret sequence</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294\DevDiv_255294.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294/*">
             <Issue>11469, The test causes OutOfMemory exception in crossgen mode.</Issue> 
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/varargs/varargsupport/*">
+            <Issue>Varargs supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/varargs/varargsupport_r/*">
+            <Issue>Varargs supported on this platform</Issue>
+        </ExcludeList>
     </ItemGroup>
 
-    <!-- The following are ARM32 failures -->
+    <!-- Windows arm64 specific excludes -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'arm64' and '$(TargetsWindows)' == 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/HeapExpansion/bestfit-threaded/*">
+            <Issue>15016</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/v2.0-rtm/494226/494226/*">
+            <Issue>15016</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/LeakWheel/leakwheel/*">
+            <Issue>15016</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Tailcall/TailcallVerifyWithPrefix/*">
+            <Issue>Uses illagal il tailcall pop ret</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*">
+            <Issue>11534</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Exceptions/ForeignThread/ForeignThreadExceptions/*">
+            <Issue>10636</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/exceptions/stacktrace/Tier1StackTrace/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/simple/simple/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/tracelogging/tracelogging/*">
+            <Issue>15494</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/reflection/Tier1Collectible/Tier1Collectible/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/15650/interfacecctor/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/15827/nonvirtualcall/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/16064/methodimpl/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/reflection/DefaultInterfaceMethods/InvokeConsumer/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm64/Simd/*">
+            <Issue>18895</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/reflection/DefaultInterfaceMethods/Emit/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventsourcetrace/eventsourcetrace/*">
+            <Issue>15494</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack/*">
+            <Issue>15016</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/15241/genericcontext/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r/*">
+            <Issue>9565</Issue>
+        </ExcludeList>
+    </ItemGroup>
 
+    <!-- Windows arm32 specific excludes -->
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'arm'">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall_v4/hijacking/*">
             <Issue>6217</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Tailcall/TailcallVerifyWithPrefix/*">
             <Issue>2420</Issue>
         </ExcludeList>
     </ItemGroup>
 
-    <!-- The following are ARM64_altjit crossgen failures. For x64_arm64_altjit buildArm==x64. -->
+    <!-- The following are x64 Unix failures. -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x64' and '$(TargetsWindows)' != 'true' and '$(BuildTestsAgainstPackages)' != 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_il_dbgseq/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_il_relseq/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_relstress1/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_relstress3/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_dbgstress1/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_dbgstress3/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_relstress1/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_relstress3/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/*">
+            <Issue>Varargs not supported on this platform</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/NativeLibs/FromNativePaths/*">
+            <Issue>Issue building native components for the test.</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinning/object-pin/*">
+            <Issue>Issue building native components for the test.</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/DefaultInterfaceMethods/constrainedcall/*">
+            <Issue>15353</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/paramthreadstart/ThreadStartBool/*">
+            <Issue>18381</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/paramthreadstart/ThreadStartBool_1/*">
+            <Issue>18381</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_18232/GitHub_18232/*">
+            <Issue>Needs Triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_19022/GitHub_19022/*">
+            <Issue>Needs Triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_19149/GitHub_19149/*">
+            <Issue>Needs Triage</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/rngchk/RngchkStress3/*">
+            <Issue>timeout</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/GitHub_19601/Github_19601/*">
+            <Issue>Needs Triage</Issue>
+        </ExcludeList>
+    </ItemGroup>
+
+    <!-- Unix arm64 specific -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'arm64' and '$(TargetsWindows)' != 'true' and '$(BuildTestsAgainstPackages)' != 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler/*">
+            <Issue>Test times out</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally/*">
+            <Issue>Test times out</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitintry/*">
+            <Issue>Test times out</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitincatch/*">
+            <Issue>Test times out</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/eh/FinallyExec/nonlocalexitinroot/*">
+            <Issue>Test times out</Issue>
+        </ExcludeList>
+    </ItemGroup>
 
-    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x64'">
+    <!-- Unix arm32 specific -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'arm' and '$(TargetsWindows)' != 'true' and '$(BuildTestsAgainstPackages)' != 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/runtimeeventsource/runtimeeventsource/*">
+            <Issue>19340</Issue>
+        </ExcludeList>
     </ItemGroup>
+    
 
     <!-- Tests that need to be triaged for vararg usage as that is not supported -->
-    <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd">
+    <!-- Note these will only be excluded for unix platforms -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TargetsWindows)' != 'true' ">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/unaligned/1/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\2\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/unaligned/2/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\4\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/unaligned/4/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\volatile\1\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/volatile/1/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\gc\misc\funclet\funclet.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/gc/misc/funclet/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i00\mcc_i00.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i00/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i01\mcc_i01.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i01/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i02\mcc_i02.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i02/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i03\mcc_i03.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i03/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i10\mcc_i10.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i10/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i11\mcc_i11.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i11/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i12\mcc_i12.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i12/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i13\mcc_i13.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i13/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i30\mcc_i30.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i30/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i31\mcc_i31.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i31/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i32\mcc_i32.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i32/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i33\mcc_i33.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i33/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i50\mcc_i50.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i50/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i51\mcc_i51.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i51/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i52\mcc_i52.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i52/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i53\mcc_i53.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i53/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i60\mcc_i60.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i60/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i61\mcc_i61.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i61/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i62\mcc_i62.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i62/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i63\mcc_i63.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i63/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i70\mcc_i70.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i70/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i71\mcc_i71.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i71/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i72\mcc_i72.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i72/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i73\mcc_i73.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i73/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i80\mcc_i80.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i80/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i81\mcc_i81.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i81/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i82\mcc_i82.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i82/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i83\mcc_i83.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i83/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Coverage\arglist_pos\arglist_pos.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Coverage/arglist_pos/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_dbgseq\_il_dbgseq.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_il_dbgseq/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_relseq\_il_relseq.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_il_relseq/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323\b26323.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423\b16423.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a\b26324a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b\b26324b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901\b28901.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838\b30838.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864\b30864.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374\b32374.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784\b35784.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472\b36472.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598\b37598.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391\b41391.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867\b46867.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745\b31745.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746\b31746.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646\b37646.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852\b41852.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793\b88793.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248\b91248.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748\b409748.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
     </ItemGroup>
@@ -418,1311 +638,1316 @@
     <!-- The following are tests that fail when building tests against packages -->
 
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildTestsAgainstPackages)' == 'true'">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/superpmi/superpmicollect/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\BenchmarksGame\k-nucleotide\k-nucleotide-1\k-nucleotide-1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-1/k-nucleotide-1*">
             <Issue>9314</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\BenchmarksGame\k-nucleotide\k-nucleotide-9\k-nucleotide-9.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide-9/k-nucleotide-9*">
             <Issue>9314</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\BenchmarksGame\regex-redux\regex-redux-1\regex-redux-1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-1/regex-redux-1*">
             <Issue>9314</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\BenchmarksGame\regex-redux\regex-redux-5\regex-redux-5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5/regex-redux-5*">
             <Issue>9314</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\BenchmarksGame\reverse-complement\reverse-complement-1\reverse-complement-1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-1/reverse-complement-1*">
             <Issue>9314</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\BenchmarksGame\reverse-complement\reverse-complement-6\reverse-complement-6.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/reverse-complement-6/reverse-complement-6*">
             <Issue>9314</Issue>
         </ExcludeList>
+
+        <!-- Disable COM tests since they don't properly run on Windows.Nano and at present there is no way to special case that OS flavor. -->
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/NETClients/Primitives/NETClientPrimitives/*">
+            <Issue>Fails on Windows.Nano</Issue>
+        </ExcludeList>
     </ItemGroup>
 
     <!-- The following are tests that fail on non-Windows, which we must not run when building against packages -->
 
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildTestsAgainstPackages)' == 'true' and '$(TargetsWindows)' != 'true'">
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\byte\ByteToString3\ByteToString3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/byte/ByteToString3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\convert\ConvertToInt32_4\ConvertToInt32_4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/convert/ConvertToInt32_4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\decimal\DecimalToInt32\DecimalToInt32.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/decimal/DecimalToInt32/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\double\DoubleToString3\DoubleToString3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/double/DoubleToString3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\double\DoubleToString4\DoubleToString4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/double/DoubleToString4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\int64\Int64ToString3\Int64ToString3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/int64/Int64ToString3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\int\Int32ToString3\Int32ToString3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/int/Int32ToString3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\multicastdelegate\MulticastDelegateCtor\MulticastDelegateCtor.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCtor/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\reflection\emit\DynMethodJumpStubTests\DynMethodJumpStubTests\DynMethodJumpStubTests.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\runtime\interopservices\marshal\MarshalGetLastWin32Error_PSC\MarshalGetLastWin32Error_PSC.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalGetLastWin32Error_PSC/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\uint16\UInt16ToString3\UInt16ToString3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/uint16/UInt16ToString3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\uint16\UInt16ToString4\UInt16ToString4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/uint16/UInt16ToString4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\cti\system\uint32\UInt32ToString2\UInt32ToString2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/uint32/UInt32ToString2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\system\collections\generic\hashset\Regression_Dev10_609271\Regression_Dev10_609271.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\system\collections\generic\hashset\Regression_Dev10_624201\Regression_Dev10_624201.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\271010\271010.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Coverage/271010/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\smalloom\smalloom.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Coverage/smalloom/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\BackgroundGC\foregroundgc\foregroundgc.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/BackgroundGC/foregroundgc/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\LOHFragmentation\lohfragmentation\lohfragmentation.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Features/LOHFragmentation/lohfragmentation/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\collect\collect.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/collect/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\getgeneration\getgeneration.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/getgeneration/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\reregisterforfinalize\reregisterforfinalize.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/reregisterforfinalize/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\finalizertest\finalizertest.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/Allocation/finalizertest/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\largeexceptiontest\largeexceptiontest.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/Allocation/largeexceptiontest/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\gettotalmemory\gettotalmemory.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/gettotalmemory/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\keepalive\keepalive.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/keepalive/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\suppressfinalize\suppressfinalize.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/LargeMemory/API/gc/suppressfinalize/*">
             <Issue>3392</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Regressions\dev10bugs\536168\536168\536168.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Regressions/dev10bugs/536168/536168/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\BaseFinal\basefinal\basefinal.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/BaseFinal/basefinal/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\doublinknoleak\doublinknoleak.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Scenarios/DoublinkList/doublinknoleak/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Stress\Framework\ReliabilityFramework\ReliabilityFramework.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/GC/Stress/Framework/ReliabilityFramework/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\Interop\MarshalAPI\IUnknown\IUnknownTest\IUnknownTest.cmd">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Interop\SizeConst\SizeConstTest\SizeConstTest.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/SizeConst/SizeConstTest/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Interop\StructMarshalling\PInvoke\MarshalStructAsLayoutExp\MarshalStructAsLayoutExp.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Interop\COM\NETClients\Primitives\NETClientPrimitives\NETClientPrimitives.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/NETClients/Primitives/NETClientPrimitives/NETClientPrimitives.*">
             <Issue>by design Windows only</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\IL\PInvokeTail\PInvokeTail\PInvokeTail.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/PInvokeTail/PInvokeTail/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\IL\PInvokeTail\TailWinApi\TailWinApi.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/PInvokeTail/TailWinApi/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/unaligned/1/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\2\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/unaligned/2/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\4\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/unaligned/4/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\volatile\1\arglist\arglist.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/PREFIX/volatile/1/arglist/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\extended\extended.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/RVAInit/extended/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\overlap\overlap.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/RVAInit/overlap/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\StructABI\StructABI\StructABI.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/StructABI/StructABI/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop2_cs_d\loop2_cs_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop2_cs_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop2_cs_do\loop2_cs_do.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop2_cs_do/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop2_cs_r\loop2_cs_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop2_cs_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop2_cs_ro\loop2_cs_ro.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop2_cs_ro/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop6_cs_d\loop6_cs_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop6_cs_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop6_cs_do\loop6_cs_do.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop6_cs_do/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop6_cs_r\loop6_cs_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop6_cs_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\UnrollLoop\loop6_cs_ro\loop6_cs_ro.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/UnrollLoop/loop6_cs_ro/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/bleref_il_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/bleref_il_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r\ldelemnullarr1_il_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d\nonrefsdarr_il_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr_il_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\oldtests\Desktop\callipinvoke_il_d\callipinvoke_il_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\oldtests\Desktop\callipinvoke_il_r\callipinvoke_il_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\oldtests\callipinvoke\callipinvoke.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/coverage/oldtests/callipinvoke/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/intrinsic/interlocked/rva_rvastatic1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic2\rva_rvastatic2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/intrinsic/interlocked/rva_rvastatic2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/intrinsic/interlocked/rva_rvastatic3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/intrinsic/interlocked/rva_rvastatic4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinning\object-pin\object-pin\object-pin.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinning/object-pin/object-pin/object-pin*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\calli_excep\calli_excep.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/calli_excep/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\jump\jump.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/jump/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\pinvoke-bug\pinvoke-bug.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/pinvoke-bug/pinvoke-bug*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/preemptive_cooperative/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\sin\sin.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/sin/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\sysinfo_cs\sysinfo_cs.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/sysinfo_cs/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\sysinfo_il\sysinfo_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/sysinfo_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\tail\tail.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/pinvoke/tail/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic1\rvastatic1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/rvastatics/rvastatic1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic2\rvastatic2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/rvastatics/rvastatic2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic3\rvastatic3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/rvastatics/rvastatic3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic4\rvastatic4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/rvastatics/rvastatic4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/rvastatics/rvastatic5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tls/mutualrecurthd-tls/mutualrecurthd-tls*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\test-tls\test-tls.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tls/test-tls/test-tls*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\Fields\getclassfrommethodparam\getclassfrommethodparam.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Generics/Fields/getclassfrommethodparam/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\pinvoke\instance01\instance01.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Generics/pinvoke/instance01/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\pinvoke\instance02\instance02.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Generics/pinvoke/instance02/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\pinvoke\instance03\instance03.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Generics/pinvoke/instance03/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\pinvoke\static01\static01.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Generics/pinvoke/static01/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\pinvoke\static02\static02.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Generics/pinvoke/static02/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_cs_il\_dbgsin_cs_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_il_cs\_dbgsin_il_cs.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_dbgsin_il_il\_dbgsin_il_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_dbgsin_il_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_cs_il\_odbgsin_cs_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_il_cs\_odbgsin_il_cs.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_odbgsin_il_il\_odbgsin_il_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_odbgsin_il_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_cs_il\_orelsin_cs_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_orelsin_cs_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_il_cs\_orelsin_il_cs.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_orelsin_il_cs/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_orelsin_il_il\_orelsin_il_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_orelsin_il_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_cs_il\_relsin_cs_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_relsin_cs_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_il_cs\_relsin_il_cs.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_relsin_il_cs/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Boxing\xlang\_relsin_il_il\_relsin_il_il.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Boxing/xlang/_relsin_il_il/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Coverage\arglist_pos\arglist_pos.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/Coverage/arglist_pos/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/cctor/misc/global_il_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/cctor/misc/global_il_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\xassem\xprecise3_cs_d\xprecise3_cs_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/cctor/xassem/xprecise3_cs_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\xassem\xprecise3_cs_do\xprecise3_cs_do.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/cctor/xassem/xprecise3_cs_do/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\xassem\xprecise3_cs_r\xprecise3_cs_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/cctor/xassem/xprecise3_cs_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\xassem\xprecise3_cs_ro\xprecise3_cs_ro.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/cctor/xassem/xprecise3_cs_ro/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg1_d\_XModuledeleg1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg1_do\_XModuledeleg1_do.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg1_do/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg1_r\_XModuledeleg1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg1_ro\_XModuledeleg1_ro.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg1_ro/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg2_d\_XModuledeleg2_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg2_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg2_do\_XModuledeleg2_do.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg2_do/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg2_r\_XModuledeleg2_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg2_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\delegate\_XModuledeleg2_ro\_XModuledeleg2_ro.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/delegate/_XModuledeleg2_ro/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/eh/deadcode/badcodeafterfinally_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/eh/deadcode/badcodeafterfinally_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_byte_1_d\expl_byte_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_byte_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_byte_1_r\expl_byte_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_byte_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_double_1_d\expl_double_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_double_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_double_1_r\expl_double_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_double_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_float_1_d\expl_float_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_float_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_float_1_r\expl_float_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_float_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_byte_1_d\expl_gc_byte_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_byte_1_r\expl_gc_byte_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_double_1_d\expl_gc_double_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_double_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_double_1_r\expl_gc_double_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_double_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_float_1_d\expl_gc_float_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_float_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_float_1_r\expl_gc_float_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_float_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_int_1_d\expl_gc_int_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_int_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_int_1_r\expl_gc_int_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_int_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_long_1_d\expl_gc_long_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_long_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_long_1_r\expl_gc_long_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_long_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_obj_1_d\expl_gc_obj_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_obj_1_r\expl_gc_obj_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_short_1_d\expl_gc_short_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_short_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_short_1_r\expl_gc_short_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_short_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_val_1_d\expl_gc_val_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_val_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_gc_val_1_r\expl_gc_val_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_gc_val_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_int_1_d\expl_int_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_int_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_int_1_r\expl_int_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_int_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_long_1_d\expl_long_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_long_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_long_1_r\expl_long_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_long_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_obj_1_d\expl_obj_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_obj_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_obj_1_r\expl_obj_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_obj_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_short_1_d\expl_short_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_short_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_short_1_r\expl_short_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_short_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_val_1_d\expl_val_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_val_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\expl_val_1_r\expl_val_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/expl_val_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_byte_1_d\seq_byte_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_byte_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_byte_1_r\seq_byte_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_byte_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_double_1_d\seq_double_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_double_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_double_1_r\seq_double_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_double_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_float_1_d\seq_float_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_float_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_float_1_r\seq_float_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_float_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_byte_1_d\seq_gc_byte_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_byte_1_r\seq_gc_byte_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_double_1_d\seq_gc_double_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_double_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_double_1_r\seq_gc_double_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_double_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_float_1_d\seq_gc_float_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_float_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_float_1_r\seq_gc_float_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_float_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_int_1_d\seq_gc_int_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_int_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_int_1_r\seq_gc_int_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_int_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_long_1_d\seq_gc_long_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_long_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_long_1_r\seq_gc_long_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_long_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_obj_1_d\seq_gc_obj_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_obj_1_r\seq_gc_obj_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_short_1_d\seq_gc_short_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_short_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_short_1_r\seq_gc_short_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_short_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_val_1_d\seq_gc_val_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_val_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_gc_val_1_r\seq_gc_val_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_gc_val_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_int_1_d\seq_int_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_int_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_int_1_r\seq_int_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_int_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_long_1_d\seq_long_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_long_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_long_1_r\seq_long_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_long_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_obj_1_d\seq_obj_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_obj_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_obj_1_r\seq_obj_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_obj_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_short_1_d\seq_short_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_short_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_short_1_r\seq_short_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_short_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_val_1_d\seq_val_1_d.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_val_1_d/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\explicit\coverage\seq_val_1_r\seq_val_1_r.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/explicit/coverage/seq_val_1_r/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_dbgstress1\_dbgstress1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_dbgstress1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_dbgstress3\_dbgstress3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_dbgstress3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_dbgseq\_il_dbgseq.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_il_dbgseq/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_relseq\_il_relseq.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_il_relseq/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_relstress1\_relstress1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_relstress1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_relstress3\_relstress3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_relstress3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_speed_dbgstress1\_speed_dbgstress1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_dbgstress1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_speed_dbgstress3\_speed_dbgstress3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_dbgstress3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_speed_relstress1\_speed_relstress1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_relstress1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_speed_relstress3\_speed_relstress3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/refany/_speed_relstress3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall/_il_dbgpointer/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer_i\_il_dbgpointer_i.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall/_il_dbgpointer_i/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer\_il_relpointer.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall/_il_relpointer/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/tailcall/_il_relpointer_i/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/operand/_il_dbglocalloc/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/operand/_il_rellocalloc/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323\b26323.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423\b16423.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a\b26324a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b\b26324b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901\b28901.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838\b30838.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864\b30864.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374\b32374.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784\b35784.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472\b36472.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598\b37598.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391\b41391.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867\b46867.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745\b31745.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746\b31746.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646\b37646.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852\b41852.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66533\b66533\b66533.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79250\b79250\b79250.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793\b88793.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248\b91248.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b07493\b07493\b07493.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07493/b07493/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M02\b20785\b20785\b20785.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.2-M02/b20785/b20785/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748\b409748.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b427411\Desktop\b427411\b427411.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b427411/Desktop/b427411/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/Dev11/dev10_865840/dev10_865840/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b302509\b302509\b302509.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V1.2-M01\b15632\b15632\b15632.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/V1.2-M01/b15632/b15632/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011\b12011.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-RTM\b286991\b286991\b286991.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\clr-x64-JIT\v2.1\b173569\b173569\b173569.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\clr-x64-JIT\v4.0\devdiv374539\DevDiv_374539\DevDiv_374539.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\gc\misc\funclet\funclet.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/gc/misc/funclet/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/localloc/verify/verify01_dynamic/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/localloc/verify/verify01_large/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/localloc/verify/verify01_small/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i00\mcc_i00.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i00/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i01\mcc_i01.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i01/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i02\mcc_i02.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i02/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i03\mcc_i03.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i03/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i04\mcc_i04.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i04/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i05\mcc_i05.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i05/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i06\mcc_i06.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i06/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i07\mcc_i07.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i07/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i10\mcc_i10.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i10/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i11\mcc_i11.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i11/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i12\mcc_i12.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i12/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i13\mcc_i13.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i13/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i14\mcc_i14.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i14/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i15\mcc_i15.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i15/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i16\mcc_i16.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i16/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i17\mcc_i17.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i17/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i30\mcc_i30.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i30/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i31\mcc_i31.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i31/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i32\mcc_i32.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i32/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i33\mcc_i33.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i33/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i34\mcc_i34.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i34/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i35\mcc_i35.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i35/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i36\mcc_i36.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i36/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i37\mcc_i37.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i37/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i50\mcc_i50.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i50/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i51\mcc_i51.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i51/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i52\mcc_i52.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i52/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i53\mcc_i53.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i53/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i54\mcc_i54.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i54/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i55\mcc_i55.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i55/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i56\mcc_i56.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i56/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i57\mcc_i57.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i57/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i60\mcc_i60.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i60/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i61\mcc_i61.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i61/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i62\mcc_i62.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i62/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i63\mcc_i63.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i63/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i64\mcc_i64.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i64/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i65\mcc_i65.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i65/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i66\mcc_i66.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i66/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i67\mcc_i67.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i67/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i70\mcc_i70.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i70/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i71\mcc_i71.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i71/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i72\mcc_i72.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i72/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i73\mcc_i73.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i73/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i74\mcc_i74.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i74/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i75\mcc_i75.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i75/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i76\mcc_i76.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i76/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i77\mcc_i77.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i77/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i80\mcc_i80.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i80/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i81\mcc_i81.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i81/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i82\mcc_i82.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i82/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i83\mcc_i83.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i83/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i84\mcc_i84.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i84/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i85\mcc_i85.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i85/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i86\mcc_i86.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i86/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i87\mcc_i87.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/mcc/interop/mcc_i87/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/regress/ndpw/21220/b21220/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\vsw\286991\test\test.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/regress/vsw/286991/test/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\tests\security\security.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Inline/tests/security/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\tests\xmodb\xmodb.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Inline/tests/xmodb/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/Tailcall/TailcallVerifyWithPrefix/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\perf\doublealign\Locals\Locals.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Locals/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\NativeLibs\FromNativePaths\FromNativePaths.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/NativeLibs/FromNativePaths/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612\Generated612.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest613\Generated613\Generated613.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest614\Generated614\Generated614.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest681\Generated681\Generated681.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest682\Generated682\Generated682.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\Generated683.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Regressions\coreclr\0584\Test584\Test584.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/0584/Test584/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\exceptions\regressions\Dev11\147911\test147911\test147911.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/exceptions/regressions/Dev11/147911/test147911/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\exceptions\regressions\V1\SEH\VJ\UnmanagedToManaged\UnmanagedToManaged.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\commitstackonlyasneeded\DefaultStackCommit\DefaultStackCommit.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\interlocked\compareexchange\compareexchangetneg\compareexchangetneg.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/interlocked/compareexchange/compareexchangetneg/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\monitor\pulse\monitorpulse02\monitorpulse02.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/monitor/pulse/monitorpulse02/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\monitor\tryenter\negativetestharness\negativetestharness.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/monitor/tryenter/negativetestharness/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\abandonedmutex\am04waitany\am04waitany.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/abandonedmutex/am04waitany/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\abandonedmutex\am05waitanymutex\am05waitanymutex.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/abandonedmutex/am05waitanymutex/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\abandonedmutex\am06abandonall\am06abandonall.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/abandonedmutex/am06abandonall/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\abandonedmutex\am07abandonmultiplemutex\am07abandonmultiplemutex.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\abandonedmutex\am08mixedarray\am08mixedarray.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/abandonedmutex/am08mixedarray/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\abandonedmutex\am09threadabort\am09threadabort.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/abandonedmutex/am09threadabort/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg1\openmutexneg1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg2\openmutexneg2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg3\openmutexneg3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg4\openmutexneg4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg5\openmutexneg5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg6\openmutexneg6.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg6/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg7\openmutexneg7.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg7/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexneg8\openmutexneg8.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexneg8/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexpos1\openmutexpos1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexpos1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexpos2\openmutexpos2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexpos2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexpos3\openmutexpos3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexpos3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\mutex\openexisting\openmutexpos4\openmutexpos4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexpos4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\paramthreadstart\ThreadStartString_1\ThreadStartString_1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/paramthreadstart/ThreadStartString_1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\readerwriterlockslim\ensurelockordering\ensurelockordering.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/readerwriterlockslim/ensurelockordering/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\135972\oswaitinlock\oswaitinlock.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/135972/oswaitinlock/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\135972\oswaitinsleep\oswaitinsleep.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/135972/oswaitinsleep/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\beta1\322338\322338.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/beta1/322338/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\beta2\417296_abort\417296_abort.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/beta2/417296_abort/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\m2\91848\91848.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/m2/91848/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\m2\tastaticconst\tastaticconst.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/m2/tastaticconst/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\regressions\whidbey_m3\105019\105019.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/whidbey_m3/105019/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphorector2\semaphorector2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphorector2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphorector3\semaphorector3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphorector3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphorector4\semaphorector4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphorector4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphorector5\semaphorector5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphorector5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg1\semaphoreopenneg1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg2\semaphoreopenneg2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg3\semaphoreopenneg3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg4\semaphoreopenneg4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg5\semaphoreopenneg5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg6\semaphoreopenneg6.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\ctoropen\semaphoreopenneg7\semaphoreopenneg7.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\semaphore\unit\semtest\semtest.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/semaphore/unit/semtest/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\exceptioninfinally\argumentexception\argumentexception.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/exceptioninfinally/argumentexception/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\exceptioninfinally\dividebyzero\dividebyzero.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/exceptioninfinally/dividebyzero/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\exceptioninfinally\nullrefexception\nullrefexception.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/exceptioninfinally/nullrefexception/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\rudeposnonhosted\rudenonhostedone\rudenonhostedone.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/rudeposnonhosted/rudenonhostedone/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\rudeposnonhosted\rudenonhostedthree\rudenonhostedthree.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/rudeposnonhosted/rudenonhostedthree/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\rudeposnonhosted\rudenonhostedtwo\rudenonhostedtwo.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/rudeposnonhosted/rudenonhostedtwo/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\rudethreadpool\rudeabortrepeat\rudeabortrepeat.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/rudethreadpool/rudeabortrepeat/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta001a\ta001a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta001a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta001b\ta001b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta001b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta002a\ta002a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta002a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta002b\ta002b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta002b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta003a\ta003a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta003a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta003b\ta003b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta003b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta004a\ta004a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta004a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta004b\ta004b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta004b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta005a\ta005a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta005a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta005b\ta005b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta005b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta006a\ta006a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta006a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta007a\ta007a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta007a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta007b\ta007b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta007b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta008a\ta008a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta008a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta009a\ta009a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta009a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta010a\ta010a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta010a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta011a\ta011a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta011a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta012a\ta012a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta012a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta012b\ta012b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta012b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta013a\ta013a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta013a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta014a\ta014a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta014a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta015a\ta015a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta015a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta016a\ta016a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta016a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta017a\ta017a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta017a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta017b\ta017b.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta017b/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta018a\ta018a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta018a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta019a\ta019a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta019a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\ta020a\ta020a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/ta020a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\threadabort\threadabort.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/threadabort/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadabort\tasuite\threadstarttwice\threadstarttwice.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadabort/tasuite/threadstarttwice/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadpool\bindhandle\bindhandle1\bindhandle1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadpool/bindhandle/bindhandle1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadpool\bindhandle\bindhandleinvalid3\bindhandleinvalid3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadpool\bindhandle\bindhandleinvalid4\bindhandleinvalid4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadpool\bindhandle\bindhandleinvalid5\bindhandleinvalid5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadpool\bindhandle\bindhandleinvalid6\bindhandleinvalid6.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\threadpool\bindhandle\bindhandleinvalid\bindhandleinvalid.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/threadpool/bindhandle/bindhandleinvalid/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\volatile\atomictest\atomictest.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/volatile/atomictest/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\abandonedmutexscenarios\threadabort\threadabort.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/abandonedmutexscenarios/threadabort/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex10\waitallex10.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex10/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex11\waitallex11.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex11/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex1\waitallex1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex2\waitallex2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex3\waitallex3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex4\waitallex4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex5\waitallex5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex6\waitallex6.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex6/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex7\waitallex7.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex7/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex8\waitallex8.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex8/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex8a\waitallex8a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex8a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex9\waitallex9.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitall/waitallex9/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex10\waitanyex10.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex10/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex1\waitanyex1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex2\waitanyex2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex3\waitanyex3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex4\waitanyex4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex5\waitanyex5.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex5/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex6\waitanyex6.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex6/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex7\waitanyex7.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex7/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex8\waitanyex8.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex8/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex8a\waitanyex8a.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex8a/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitany\waitanyex9\waitanyex9.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitany/waitanyex9/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitone\waitoneex1\waitoneex1.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitone/waitoneex1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitone\waitoneex2\waitoneex2.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitone/waitoneex2/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitone\waitoneex3\waitoneex3.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitone/waitoneex3/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitone\waitoneex4\waitoneex4.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/waithandle/waitone/waitoneex4/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\managed\Compilation\Compilation\Compilation.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/managed/Compilation/Compilation/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\tracing\eventsource\eventpipeandetw\eventpipeandetw\eventpipeandetw.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventsource/eventpipeandetw/eventpipeandetw/*">
             <Issue>by design Windows only</Issue>
         </ExcludeList>
     </ItemGroup>
@@ -1730,13 +1955,13 @@
     <!-- Failures while testing via ILLINK -->
     
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(RunTestsViaIllink)' == 'true'">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/superpmi/superpmicollect/*">
             <!-- Linker runs reset CORE_ROOT to the linked directory based on superpmicollect.exe.
                  The test runs other benchmarks to collect superpmi data.
                  These tests cannot run from the binaries generated wrt superpmicollect.exe -->
             <Issue>By Test Infrastructure design</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\nested\nested.cmd">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/RVAInit/nested/*">
             <!-- Data refered from static field is dropped -->
             <Issue>Bug</Issue>
         </ExcludeList>
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index fb19439527..45e722f1e7 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -41,6 +41,8 @@ set __CrossgenAltJit=
 set __PerfTests=
 set __CoreFXTests=
 set __CoreFXTestsRunAllAvailable=
+set __SkipGenerateLayout=
+set __BuildXUnitWrappers=
 
 :Arg_Loop
 if "%1" == "" goto ArgsDone
@@ -78,6 +80,8 @@ if /i "%1" == "jitforcerelocs"        (set COMPlus_ForceRelocs=1&shift&goto Arg_
 if /i "%1" == "jitdisasm"             (set __JitDisasm=1&shift&goto Arg_Loop)
 if /i "%1" == "ilasmroundtrip"        (set __IlasmRoundTrip=1&shift&goto Arg_Loop)
 if /i "%1" == "GenerateLayoutOnly"    (set __GenerateLayoutOnly=1&shift&goto Arg_Loop)
+if /i "%1" == "skipgeneratelayout"    (set __SkipGenerateLayout=1&shift&goto Arg_Loop)
+if /i "%1" == "buildxunitwrappers"    (set __BuildXunitWrappers=1&shift&goto Arg_Loop)
 if /i "%1" == "PerfTests"             (set __PerfTests=true&shift&goto Arg_Loop)
 if /i "%1" == "CoreFXTests"           (set __CoreFXTests=true&shift&goto Arg_Loop)
 if /i "%1" == "CoreFXTestsAll"        (set __CoreFXTests=true&set __CoreFXTestsRunAllAvailable=true&shift&goto Arg_Loop)
@@ -90,7 +94,7 @@ if /i "%1" == "gcname"                (set COMPlus_GCName=%2&shift&shift&goto Ar
 if /i "%1" == "timeout"               (set __TestTimeout=%2&shift&shift&goto Arg_Loop)
 
 REM change it to COMPlus_GCStress when we stop using xunit harness
-if /i "%1" == "gcstresslevel"         (set __GCSTRESSLEVEL=%2&set __TestTimeout=1800000&shift&shift&goto Arg_Loop)
+if /i "%1" == "gcstresslevel"         (set COMPlus_GCStress=%2&set __TestTimeout=1800000&shift&shift&goto Arg_Loop)
 if /i "%1" == "collectdumps"          (set __CollectDumps=true&shift&goto Arg_Loop)
 
 if /i not "%1" == "msbuildargs" goto SkipMsbuildArgs
@@ -132,6 +136,77 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
 if not defined XunitTestBinBase       set  XunitTestBinBase=%__TestWorkingDir%
 if not defined XunitTestReportDirBase set  XunitTestReportDirBase=%XunitTestBinBase%\Reports\
 
+REM At this point in the script there will be a divergence in how the tests are run.
+REM For official builds we will continue to run tests using the un-unified scripting
+REM which relies on msbuild and calls runtest.proj directly. For all other scenarios
+REM runtest.py will handle setup and will then call runtest.proj
+
+if defined __AgainstPackages goto SetupMSBuildAndCallRuntestProj
+if "%__CoreFXTests%"=="true" goto SetupMSBuildAndCallRuntestProj
+if "%__PerfTests%"=="true" goto SetupMSBuildAndCallRuntestProj
+if defined __GenerateLayoutOnly goto SetupMSBuildAndCallRuntestProj
+
+REM We are not running in the official build scenario, call runtest.py
+
+set __RuntestPyArgs=-arch %__BuildArch% -build_type %__BuildType%
+
+if defined DoLink (
+    set __RuntestPyArgs=%__RuntestPyArgs% --il_link
+)
+
+if defined __LongGCTests (
+    set __RuntestPyArgs=%__RuntestPyArgs% --long_gc
+)
+
+if defined __GCSimulatorTests (
+    set __RuntestPyArgs=%__RuntestPyArgs% --gcsimulator
+)
+
+if defined __JitDisasm (
+    set __RuntestPyArgs=%__RuntestPyArgs% --jitdisasm
+)
+
+if defined __IlasmRoundTrip (
+    set __RuntestPyArgs=%__RuntestPyArgs% --ilasmroundtrip
+)
+
+if defined __TestEnv (
+    set __RuntestPyArgs=%__RuntestPyArgs% -test_env %__TestEnv%
+)
+
+if defined __Sequential (
+    set __RuntestPyArgs=%__RuntestPyArgs% --sequential
+)
+
+if not defined __SkipGenerateLayout (
+    set __RuntestPyArgs=%__RuntestPyArgs% --generate_layout
+)
+
+if defined __GenerateLayoutOnly (
+    set __RuntestPyArgs=%__RuntestPyArgs% --generate_layout_only
+)
+
+if defined __BuildXUnitWrappers (
+    set __RuntestPyArgs=%__RuntestPyArgs% --build_xunit_test_wrappers
+)
+
+if defined RunCrossGen (
+    set __RuntestPyArgs=%__RuntestPyArgs% --run_crossgen_tests
+)
+
+if defined __DoCrossgen (
+    set __RuntestPyArgs=%__RuntestPyArgs% --precompile_core_root
+)
+
+REM __ProjectDir is poorly named, it is actually <projectDir>/tests
+set NEXTCMD=python "%__ProjectDir%\runtest.py" %__RuntestPyArgs%
+echo !NEXTCMD!
+!NEXTCMD!
+
+exit /b %ERRORLEVEL%
+
+:SetupMSBuildAndCallRuntestProj
+
 :: Set up msbuild and tools environment. Check if msbuild and VS exist.
 
 set _msbuildexe=
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 52eeaaf1e5..ea9a0d15ec 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -316,6 +316,9 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
       <AllXUnitFacts Include= "%(AllCommands._XunitFact)" />
     </ItemGroup>
 
+    <Message Text="HasExcludes: $(HaveExcludes)" Importance="high"/>
+    <Message Text="CanonicalExcludeList: @(CanonicalExcludeList)" Importance="high"/>
+
   </Target>
 
   <Target Name="CreateAllWrappers" DependsOnTargets="GetListOfTestCmds;FindCmdDirectories">
diff --git a/tests/runtest.py b/tests/runtest.py
index 7cadfb4b10..6d0d30eb38 100755
--- a/tests/runtest.py
+++ b/tests/runtest.py
@@ -1,12 +1,36 @@
 #!/usr/bin/env python
-################################################################################
-################################################################################
 #
-# Module: runtest.py
+## 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.
+#
+##
+# Title               :runtest.py
 #
 # Notes:
 #  
-# Universal script to setup and run the xunit msbuild test runner.
+# Universal script to setup and run the xunit console runner. The script relies 
+# on runtest.proj and the bash and batch wrappers. All test excludes will also 
+# come from issues.targets. If there is a jit stress or gc stress exclude, 
+# please add GCStressIncompatible or JitOptimizationSensitive to the test's 
+# ilproj or csproj.
+#
+# The xunit runner currently relies on tests being built on the same host as the
+# target platform. This requires all tests run on linux x64 to be built by the
+# same platform and arch. If this is not done, the tests will run correctly;
+# however, expect failures due to incorrect exclusions in the xunit 
+# wrappers setup at build time.
+#
+# Note that for linux targets the native components to the tests are still built
+# by the product build. This requires all native components to be either copied
+# into the Core_Root directory or the test's managed directory. The latter is
+# prone to failure; however, copying into the Core_Root directory may create
+# naming conflicts.
+#
+# If you are running tests on a different target than the host that built, the
+# native tests components must be copied from:
+# bin/obj/<Host>.<Arch>.<BuildType/tests to the target. If the location is not
+# standard please pass the -test_native_bin_location flag to the script.
 #
 # Use the instructions here:
 #    https://github.com/dotnet/coreclr/blob/master/Documentation/building/windows-test-instructions.md 
@@ -16,13 +40,20 @@
 ################################################################################
 
 import argparse
+import datetime
 import json
+import math
 import os
 import platform
 import shutil
 import subprocess
 import sys
 import tempfile
+import time
+import re
+import string
+
+import xml.etree.ElementTree
 
 from collections import defaultdict
 from sys import platform as _platform
@@ -31,25 +62,342 @@ from sys import platform as _platform
 # Argument Parser
 ################################################################################
 
-description = ("""Simple script that essentially sets up and runs either runtest.cmd
-                  or runtests.sh. This wrapper is necessary to do all the setup work.
+description = ("""Universal script to setup and run the xunit console runner. The script relies 
+on runtest.proj and the bash and batch wrappers. All test excludes will also 
+come from issues.targets. If there is a jit stress or gc stress exclude, 
+please add GCStressIncompatible or JitOptimizationSensitive to the test's 
+ilproj or csproj.
 
-                  Note that this is required because there is not a unified test runner
-                  for coreclr.""")
+The xunit runner currently relies on tests being built on the same host as the
+target platform. This requires all tests run on linux x64 to be built by the
+same platform and arch. If this is not done, the tests will run correctly;
+however, expect failures due to incorrect exclusions in the xunit 
+wrappers setup at build time.
 
-# Use either - or / to designate switches.
-parser = argparse.ArgumentParser(description=description, prefix_chars='-/')
+Note that for linux targets the native components to the tests are still built
+by the product build. This requires all native components to be either copied
+into the Core_Root directory or the test's managed directory. The latter is
+prone to failure; however, copying into the Core_Root directory may create
+naming conflicts.
+
+If you are running tests on a different target than the host that built, the
+native tests components must be copied from:
+bin/obj/<Host>.<Arch>.<BuildType/tests to the target. If the location is not
+standard please pass the -test_native_bin_location flag to the script.""")
+
+parser = argparse.ArgumentParser(description=description)
 
 parser.add_argument("-arch", dest="arch", nargs='?', default="x64")
 parser.add_argument("-build_type", dest="build_type", nargs='?', default="Debug")
 parser.add_argument("-test_location", dest="test_location", nargs="?", default=None)
 parser.add_argument("-core_root", dest="core_root", nargs='?', default=None)
-parser.add_argument("-coreclr_repo_location", dest="coreclr_repo_location", default=os.getcwd())
+parser.add_argument("-product_location", dest="product_location", nargs='?', default=None)
+parser.add_argument("-coreclr_repo_location", dest="coreclr_repo_location", default=os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+parser.add_argument("-test_env", dest="test_env", default=None)
+parser.add_argument("-crossgen_altjit", dest="crossgen_altjit", default=None)
+
+# Optional arguments which change execution.
+
+# Rid is used only for restoring packages. This is a unspecified and undocumented
+# environment variable that needs to be passed to build.proj. Do not use this
+# unless you are attempting to target package restoration for another host/arch/os
+parser.add_argument("-rid", dest="rid", nargs="?", default=None)
+
+parser.add_argument("--il_link", dest="il_link", action="store_true", default=False)
+parser.add_argument("--long_gc", dest="long_gc", action="store_true", default=False)
+parser.add_argument("--gcsimulator", dest="gcsimulator", action="store_true", default=False)
+parser.add_argument("--jitdisasm", dest="jitdisasm", action="store_true", default=False)
+parser.add_argument("--ilasmroundtrip", dest="ilasmroundtrip", action="store_true", default=False)
+parser.add_argument("--run_crossgen_tests", dest="run_crossgen_tests", action="store_true", default=False)
+parser.add_argument("--precompile_core_root", dest="precompile_core_root", action="store_true", default=False)
+parser.add_argument("--sequential", dest="sequential", action="store_true", default=False)
+
+parser.add_argument("--build_xunit_test_wrappers", dest="build_test_wrappers", action="store_true", default=False)
+parser.add_argument("--generate_layout", dest="generate_layout", action="store_true", default=False)
+parser.add_argument("--generate_layout_only", dest="generate_layout_only", action="store_true", default=False)
+parser.add_argument("--analyze_results_only", dest="analyze_results_only", action="store_true", default=False)
+parser.add_argument("--verbose", dest="verbose", action="store_true", default=False)
 
 # Only used on Unix
 parser.add_argument("-test_native_bin_location", dest="test_native_bin_location", nargs='?', default=None)
 
 ################################################################################
+# Globals
+################################################################################
+
+g_verbose = False
+gc_stress_c = False
+gc_stress = False
+file_name_cache = defaultdict(lambda: None)
+
+################################################################################
+# Classes
+################################################################################
+
+class DebugEnv:
+    def __init__(self, 
+                 host_os, 
+                 arch, 
+                 build_type, 
+                 env, 
+                 core_root,
+                 coreclr_repo_location, 
+                 test):
+        """ Go through the failing tests and create repros for them
+
+        Args:
+            host_os (String)        : os
+            arch (String)           : architecture
+            build_type (String)     : build configuration (debug, checked, release)
+            env                     : env for the repro
+            core_root (String)      : Core_Root path
+            coreclr_repo_location   : coreclr repo location
+            test ({})               : The test metadata
+        
+        """
+        self.unique_name = "%s_%s_%s_%s" % (test["name"],
+                                            host_os,
+                                            arch,
+                                            build_type)
+
+        self.host_os = host_os
+        self.arch = arch
+        self.build_type = build_type
+        self.env = env
+        self.core_root = core_root
+        self.test = test
+        self.test_location = test["test_path"]
+        self.coreclr_repo_location = coreclr_repo_location
+
+        self.__create_repro_wrapper__()
+
+        self.path = None
+        
+        if self.host_os == "Windows_NT":
+            self.path = self.unique_name + ".cmd"
+        else:
+            self.path = self.unique_name + ".sh"
+
+        repro_location = os.path.join(coreclr_repo_location, "bin", "repro", "%s.%s.%s" % (self.host_os, arch, build_type))
+        assert os.path.isdir(repro_location)
+
+        self.repro_location = repro_location
+
+        self.path = os.path.join(repro_location, self.path)
+        
+        exe_location = os.path.splitext(self.test_location)[0] + ".exe"
+        if os.path.isfile(exe_location):
+            self.exe_location = exe_location
+            self.__add_configuration_to_launch_json__()
+
+    def __add_configuration_to_launch_json__(self):
+        """ Add to or create a launch.json with debug information for the test
+
+        Notes:
+            This will allow debugging using the cpp extension in vscode.
+        """
+
+        repro_location = self.repro_location
+        assert os.path.isdir(repro_location)
+
+        vscode_dir = os.path.join(repro_location, ".vscode")
+        if not os.path.isdir(vscode_dir):
+            os.mkdir(vscode_dir)
+
+        assert os.path.isdir(vscode_dir)
+
+        launch_json_location = os.path.join(vscode_dir, "launch.json")
+        if not os.path.isfile(launch_json_location):
+            initial_json = {
+                "version": "0.2.0",
+                "configurations": []
+            }
+
+            json_str = json.dumps(initial_json, 
+                                  indent=4, 
+                                  separators=(',', ': '))
+
+            with open(launch_json_location, 'w') as file_handle:
+                file_handle.write(json_str)
+
+        launch_json = None
+        with open(launch_json_location) as file_handle:
+            launch_json = file_handle.read()
+        
+        launch_json = json.loads(launch_json)
+
+        configurations = launch_json["configurations"]
+
+        dbg_type = "cppvsdbg" if self.host_os == "Windows_NT" else ""
+        core_run = os.path.join(self.core_root, "corerun")
+
+        env = {
+            "COMPlus_AssertOnNYI": "1",
+            "COMPlus_ContinueOnAssert": "0"
+        }
+
+        if self.env is not None:
+            # Convert self.env to a defaultdict
+            self.env = defaultdict(lambda: None, self.env)
+            for key, value in env.iteritems():
+                self.env[key] = value
+            
+        else:
+            self.env = env
+
+        environment = []
+        for key, value in self.env.iteritems():
+            env = {
+                "name": key,
+                "value": value
+            }
+
+            environment.append(env)
+
+        configuration = defaultdict(lambda: None, {
+            "name": self.unique_name,
+            "type": dbg_type,
+            "request": "launch",
+            "program": core_run,
+            "args": [self.exe_location],
+            "stopAtEntry": False,
+            "cwd": os.path.join("${workspaceFolder}", "..", ".."),
+            "environment": environment,
+            "externalConsole": True
+        })
+
+        if self.build_type.lower() != "release":
+            symbol_path = os.path.join(self.core_root, "PDB")
+            configuration["symbolSearchPath"] = symbol_path
+
+        # Update configuration if it already exists.
+        config_exists = False
+        for index, config in enumerate(configurations):
+            if config["name"] == self.unique_name:
+                configurations[index] = configuration
+                config_exists = True
+
+        if not config_exists:
+            configurations.append(configuration)
+        json_str = json.dumps(launch_json,
+                              indent=4, 
+                              separators=(',', ': '))
+
+        with open(launch_json_location, 'w') as file_handle:
+            file_handle.write(json_str)
+
+    def __create_repro_wrapper__(self):
+        """ Create the repro wrapper
+        """
+
+        if self.host_os == "Windows_NT":
+            self.__create_batch_wrapper__()
+        else:
+            self.__create_bash_wrapper__()
+
+    def __create_batch_wrapper__(self):
+        """ Create a windows batch wrapper
+        """
+    
+        wrapper = \
+"""@echo off
+REM ============================================================================
+REM Repro environment for %s
+REM 
+REM Notes:
+REM 
+REM This wrapper is automatically generated by runtest.py. It includes the
+REM necessary environment to reproduce a failure that occured during running
+REM the tests.
+REM
+REM In order to change how this wrapper is generated, see
+REM runtest.py:__create_batch_wrapper__(). Please note that it is possible
+REM to recreate this file by running tests/runtest.py --analyze_results_only
+REM with the appropriate environment set and the correct arch and build_type
+REM passed.
+REM
+REM ============================================================================
+
+REM Set Core_Root if it has not been already set.
+if "%%CORE_ROOT%%"=="" set CORE_ROOT=%s
+
+echo Core_Root is set to: "%%CORE_ROOT%%"
+
+""" % (self.unique_name, self.core_root)
+
+        line_sep = os.linesep
+
+        if self.env is not None:
+            for key, value in self.env.iteritems():
+                wrapper += "echo set %s=%s%s" % (key, value, line_sep)
+                wrapper += "set %s=%s%s" % (key, value, line_sep)
+
+        wrapper += "%s" % line_sep
+        wrapper += "echo call %s%s" % (self.test_location, line_sep) 
+        wrapper += "call %s%s" % (self.test_location, line_sep) 
+
+        self.wrapper = wrapper
+    
+    def __create_bash_wrapper__(self):
+        """ Create a unix bash wrapper
+        """
+    
+        wrapper = \
+"""
+#============================================================================
+# Repro environment for %s
+# 
+# Notes:
+#
+# This wrapper is automatically generated by runtest.py. It includes the
+# necessary environment to reproduce a failure that occured during running
+# the tests.
+#
+# In order to change how this wrapper is generated, see
+# runtest.py:__create_bash_wrapper__(). Please note that it is possible
+# to recreate this file by running tests/runtest.py --analyze_results_only
+# with the appropriate environment set and the correct arch and build_type
+# passed.
+#
+# ============================================================================
+
+# Set Core_Root if it has not been already set.
+if [ \"${CORE_ROOT}\" = \"\" ] || [ ! -z \"${CORE_ROOT}\" ]; then 
+    export CORE_ROOT=%s 
+else 
+    echo \"CORE_ROOT set to ${CORE_ROOT}\"
+fi
+
+""" % (self.unique_name, self.core_root)
+
+        line_sep = os.linesep
+
+        if self.env is not None:
+            for key, value in self.env.iteritems():
+                wrapper += "echo export %s=%s%s" % (key, value, line_sep)
+                wrapper += "export %s=%s%s" % (key, value, line_sep)
+
+        wrapper += "%s" % line_sep
+        wrapper += "echo bash %s%s" % (self.test_location, line_sep) 
+        wrapper += "bash %s%s" % (self.test_location, line_sep) 
+
+        self.wrapper = wrapper
+
+    def write_repro(self):
+        """ Write out the wrapper
+
+        Notes:
+            This will check if the wrapper repros or not. If it does not repro
+            it will be put into an "unstable" folder under bin/repro.
+            Else it will just be written out.
+
+        """
+
+        with open(self.path, 'w') as file_handle:
+            file_handle.write(self.wrapper)
+
+
+################################################################################
 # Helper Functions
 ################################################################################
    
@@ -68,6 +416,7 @@ def create_and_use_test_env(_os, env, func):
         on windows, until xunit is used on unix there is no managed code run
         in runtest.sh.
     """
+    global gc_stress_c
 
     complus_vars = defaultdict(lambda: None)
 
@@ -94,26 +443,32 @@ REM Temporary test env for test run.
 
 """
 
-        with tempfile.NamedTemporaryFile() as test_env:
-            with open(test_env.name, 'w') as file_handle:
-                file_handle.write(file_header)
-                
-                for key in complus_vars:
-                    value = complus_vars[key]
-                    command = None
-                    if _os == "Windows_NT":
-                        command = "set"
-                    else:
-                        command = "export"
+        contents = ""
 
-                    print "Unset %s" % key
-                    os.environ[key] = ""
+        with tempfile.NamedTemporaryFile(mode="w") as test_env:
+            test_env.write(file_header)
+            contents += file_header
+            
+            for key in complus_vars:
+                value = complus_vars[key]
+                command = None
+                if _os == "Windows_NT":
+                    command = "set"
+                else:
+                    command = "export"
 
-                    file_handle.write("%s %s=%s%s" % (command, key, value, os.linesep))
+                print "Unset %s" % key
+                if key.lower() == "complus_gcstress" and "c" in value.lower():
+                    gc_stress_c = True
 
-            contents = None
-            with open(test_env.name) as file_handle:
-                contents = file_handle.read()
+                if key.lower() == "complus_gcstress":
+                    gc_stress = True
+
+                os.environ[key] = ""
+
+                line = "%s %s=%s%s" % (command, key, value, os.linesep)
+                test_env.write(line)
+                contents += line
 
             print
             print "TestEnv: %s" % test_env.name
@@ -123,19 +478,19 @@ REM Temporary test env for test run.
             print contents
             print
 
-            func(test_env.name)
+            return func(test_env.name)
 
     else:
-        func(None)
+        return func(None)
 
-def get_environment():
+def get_environment(test_env=None):
     """ Get all the COMPlus_* Environment variables
     
     Notes:
-        Windows uses msbuild for its test runner. Therefore, all COMPlus
-        variables will need to be captured as a test_env script and passed
-        to runtest.cmd.
+        All COMPlus variables need to be captured as a test_env script to avoid
+        influencing the test runner.
     """
+    global gc_stress_c
 
     complus_vars = defaultdict(lambda: "")
     
@@ -147,19 +502,51 @@ def get_environment():
             complus_vars[key] = os.environ[key]
             os.environ[key] = ''
 
+    # Get the env from the test_env
+    if test_env is not None:
+        with open(test_env) as file_handle:
+            for item in file_handle.readlines():
+                key_split = item.split("=")
+
+                if len(key_split) == 1:
+                    continue
+
+                key = key_split[0]
+                value = key_split[1]
+
+                key = key.split(" ")[-1]
+                value = value.strip()
+
+                try:
+                    value = value.split(" ")[0]
+                except:
+                    pass
+
+                complus_vars[key] = value
+
+                # Supoort looking up case insensitive.
+                complus_vars[key.lower()] = value
+
+        if "complus_gcstress" in complus_vars:
+            gc_stress = True
+
+        if "c" in complus_vars["COMPlus_GCStress"].lower():
+            gc_stress_c = True
+
     return complus_vars
 
 def call_msbuild(coreclr_repo_location,
-                 msbuild_location,
+                 dotnetcli_location,
                  host_os,
                  arch,
                  build_type, 
+                 is_illink=False,
                  sequential=False):
     """ Call msbuild to run the tests built.
 
     Args:
         coreclr_repo_location(str)  : path to coreclr repo
-        msbuild_location(str)       : path to msbuild
+        dotnetcli_location(str)     : path to the dotnet cli in the tools dir
         sequential(bool)            : run sequentially if True
 
         host_os(str)                : os
@@ -171,6 +558,7 @@ def call_msbuild(coreclr_repo_location,
         the test_env, should it need to be passed.
 
     """
+    global g_verbose
 
     common_msbuild_arguments = ["/nologo", "/nodeReuse:false", "/p:Platform=%s" % arch]
 
@@ -183,10 +571,14 @@ def call_msbuild(coreclr_repo_location,
     if not os.path.isdir(logs_dir):
         os.makedirs(logs_dir)
     
-    command =   [msbuild_location,
-                os.path.join(coreclr_repo_location, "tests", "runtest.proj"),
-                "/p:Runtests=true",
-                "/clp:showcommandline"]
+    command =   [dotnetcli_location,
+                 "msbuild",
+                 os.path.join(coreclr_repo_location, "tests", "runtest.proj"),
+                 "/p:Runtests=true",
+                 "/clp:showcommandline"]
+
+    if is_illink:
+        command += ["/p:RunTestsViaIllink=true"]
 
     log_path = os.path.join(logs_dir, "TestRunResults_%s_%s_%s" % (host_os, arch, build_type))
     build_log = log_path + ".log"
@@ -196,8 +588,10 @@ def call_msbuild(coreclr_repo_location,
     msbuild_log_args = ["/fileloggerparameters:\"Verbosity=normal;LogFile=%s\"" % build_log,
                         "/fileloggerparameters1:\"WarningsOnly;LogFile=%s\"" % wrn_log,
                         "/fileloggerparameters2:\"ErrorsOnly;LogFile=%s\"" % err_log,
-                        "/consoleloggerparameters:Summary",
-                        "/verbosity:diag"]
+                        "/consoleloggerparameters:Summary"]
+
+    if g_verbose:
+        msbuild_log_args += ["/verbosity:diag"]
 
     command += msbuild_log_args
 
@@ -206,11 +600,34 @@ def call_msbuild(coreclr_repo_location,
                 "/p:__BuildType=%s" % build_type,
                 "/p:__LogsDir=%s" % logs_dir]
 
-    if host_os != "Windows_NT":
-        command = ["bash"] + command
-
     print " ".join(command)
-    subprocess.check_output(command)
+    proc = subprocess.Popen(command)
+
+    try:
+        proc.communicate()
+    except:
+        proc.kill()
+        sys.exit(1)
+
+    return proc.returncode
+
+def running_in_ci():
+    """ Check if running in ci
+
+    Returns:
+        bool
+    """
+
+    is_ci = False
+
+    try:
+        jenkins_build_number = os.environ["BUILD_NUMBER"]
+
+        is_ci = True
+    except:
+        pass
+
+    return is_ci
 
 def copy_native_test_bin_to_core_root(host_os, path, core_root):
     """ Recursively copy all files to core_root
@@ -230,7 +647,38 @@ def copy_native_test_bin_to_core_root(host_os, path, core_root):
             copy_native_test_bin_to_core_root(host_os, os.path.join(path, item), core_root)
     elif path.endswith(extension):
         print "cp -p %s %s" % (path, core_root)
-        shutil.copy2(path, core_root) 
+        shutil.copy2(path, core_root)
+
+def correct_line_endings(host_os, test_location, root=True):
+    """ Recursively correct all .sh/.cmd files to the correct line ending
+
+    Args:
+        host_os(str)        : os
+        test_location(str)  : location of the tests
+    """
+    if root:
+        print "Correcting line endings..."
+
+    assert os.path.isdir(test_location) or os.path.isfile(test_location)
+
+    extension = "cmd" if host_os == "Windows_NT" else ".sh"
+    incorrect_line_ending = '\n' if host_os == "Windows_NT" else '\r\n'
+    correct_line_ending = os.linesep
+
+    if os.path.isdir(test_location):
+        for item in os.listdir(test_location):
+            correct_line_endings(host_os, os.path.join(test_location, item), False)
+    elif test_location.endswith(extension):
+        content = None
+        with open(test_location) as file_handle:
+            content = file_handle.read()
+        
+        assert content != None
+        subbed_content = content.replace(incorrect_line_ending, correct_line_ending)
+
+        if content != subbed_content:
+            with open(test_location, 'w') as file_handle:
+                file_handle.write(subbed_content)
 
 def run_tests(host_os,
               arch,
@@ -244,6 +692,8 @@ def run_tests(host_os,
               is_gcsimulator=False,
               is_jitdasm=False,
               is_ilasm=False,
+              is_illink=False,
+              run_crossgen_tests=False,
               run_sequential=False):
     """ Run the coreclr tests
     
@@ -257,44 +707,56 @@ def run_tests(host_os,
         test_native_bin_location    : Native test components, None and windows.
         test_env(str)               : path to the test_env to be used
     """
+    global gc_stress
+    
+    # Setup the dotnetcli location
+    dotnetcli_location = os.path.join(coreclr_repo_location, "Tools", "dotnetcli", "dotnet%s" % (".exe" if host_os == "Windows_NT" else ""))
 
-    # Copy all the native libs to core_root
-    if host_os != "Windows_NT":
-        copy_native_test_bin_to_core_root(host_os, os.path.join(test_native_bin_location, "src"), core_root)
-
-    # Setup the msbuild location
-    msbuild_location = os.path.join(coreclr_repo_location, "Tools", "msbuild.%s" % ("cmd" if host_os == "Windows_NT" else "sh"))
+    # Default timeout for unix is 15 minutes
+    os.environ["__TestTimeout"] = str(15*60*1000) # 900,000 ms
 
     # Setup the environment
     if is_long_gc:
         print "Running Long GC Tests, extending timeout to 20 minutes."
-        os.environ["__TestTimeout"] = "1200000" # 1,200,000
+        os.environ["__TestTimeout"] = str(20*60*1000) # 1,200,000 ms
         os.environ["RunningLongGCTests"] = "1"
     
     if is_gcsimulator:
         print "Running GCSimulator tests, extending timeout to one hour."
-        os.environ["__TestTimeout"] = "3600000" # 3,600,000
+        os.environ["__TestTimeout"] = str(60*60*1000) # 3,600,000 ms
         os.environ["RunningGCSimulatorTests"] = "1"
 
     if is_jitdasm:
-        print "Running jit disasm on framework and test assemblies."
+        print "Running jit disasm and tests."
         os.environ["RunningJitDisasm"] = "1"
 
     if is_ilasm:
         print "Running ILasm round trip."
         os.environ["RunningIlasmRoundTrip"] = "1"
 
+    if run_crossgen_tests:
+        print "Running tests R2R"
+        os.environ["RunCrossGen"] = "true"
+
+    if gc_stress:
+        print "Running GCStress, extending timeout to 120 minutes."
+        os.environ["__TestTimeout"] = str(120*60*1000) # 1,800,000 ms
+
     # Set Core_Root
     os.environ["CORE_ROOT"] = core_root
 
-    # Call msbuild.
-    call_msbuild(coreclr_repo_location,
-                 msbuild_location,
-                 host_os,
-                 arch,
-                 build_type,
-                 sequential=run_sequential)
+    # Set test env if exists
+    if test_env is not None:
+        os.environ["__TestEnv"] = test_env
 
+    # Call msbuild.
+    return call_msbuild(coreclr_repo_location,
+                        dotnetcli_location,
+                        host_os,
+                        arch,
+                        build_type,
+                        is_illink=is_illink,
+                        sequential=run_sequential)
 
 def setup_args(args):
     """ Setup the args based on the argparser obj
@@ -307,8 +769,11 @@ def setup_args(args):
         location using the build type and the arch.
     """
 
+    if args.generate_layout_only:
+        args.generate_layout = True
+
     host_os = None
-    arch = args.arch
+    arch = args.arch.lower()
     build_type = args.build_type
 
     test_location = args.test_location
@@ -331,17 +796,122 @@ def setup_args(args):
 
     assert os.path.isdir(coreclr_repo_location)
 
+    valid_arches = ["x64", "x86", "arm", "arm64"]
+    if not arch in valid_arches:
+        print "Unsupported architecture: %s." % arch
+        print "Supported architectures: %s" % "[%s]" % ", ".join(valid_arches)
+        sys.exit(1)
+
+    def check_build_type(build_type):
+        valid_build_types = ["Debug", "Checked", "Release"]
+
+        if build_type != None and len(build_type) > 0:
+            # Force the build type to be capitalized
+            build_type = build_type.capitalize()
+
+        if not build_type in valid_build_types:
+            print "Unsupported configuration: %s." % build_type
+            print "Supported configurations: %s" % "[%s]" % ", ".join(valid_build_types)
+            sys.exit(1)
+
+        return build_type
+
+    build_type = check_build_type(build_type)
+
     if test_location is None:
-        print "Using default test location."
-        test_location = os.path.join(coreclr_repo_location, "bin", "tests", "%s.%s.%s" % (host_os, arch, build_type))
-        print "TestLocation: %s" % test_location
-        print
+        default_test_location = os.path.join(coreclr_repo_location, "bin", "tests", "%s.%s.%s" % (host_os, arch, build_type))
+        
+        if os.path.isdir(default_test_location):
+            test_location = default_test_location
+
+            print "Using default test location."
+            print "TestLocation: %s" % default_test_location
+            print
+
+        else:
+            # The tests for the default location have not been built.
+            print "Error, unable to find the tests at %s" % default_test_location
+
+            suggested_location = None
+            possible_test_locations = [item for item in os.listdir(os.path.join(coreclr_repo_location, "bin", "tests")) if host_os in item and arch in item]
+            if len(possible_test_locations) > 0:
+                print "Tests are built for the following:"
+                for item in possible_test_locations:
+                    print item.replace(".", " ")
+                
+                print "Please run runtest.py again with the correct build-type by passing -build_type"
+            else:
+                print "No tests have been built for this host and arch. Please run build-test.%s" % ("cmd" if host_os == "Windows_NT" else "sh")
+            
+            sys.exit(1)
+    else:
+        # If we have supplied our own test location then we need to create a test location
+        # that the scripting will expect. As it is now, there is a dependency on the
+        # test location being under test/<os>.<build_type>.<arch>
+
+        # Make sure that we are using the correct build_type. This is a test drop, it is possible
+        # that we are inferring the build type to be Debug incorrectly.
+
+        if build_type not in test_location:
+            # Remove punctuation
+            corrected_build_type = re.sub("[%s]" % string.punctuation, "", test_location.split(".")[-1])
+            build_type = check_build_type(corrected_build_type)
+
+        default_test_location = os.path.join(coreclr_repo_location, "bin", "tests", "%s.%s.%s" % (host_os, arch, build_type))
+
+        # Remove optional end os.path.sep
+        if test_location[-1] == os.path.sep:
+            test_location = test_location[:-1]
+
+        if test_location != default_test_location and os.path.isdir(default_test_location):
+            # Remove the existing directory if there is one.
+            shutil.rmtree(default_test_location)
+
+            print "Non-standard test location being used."
+            print "Overwrite the standard location with these tests."
+            print "TODO: Change runtest.proj to allow running from non-standard test location."
+            print ""
+
+            print "cp -r %s %s" % (test_location, default_test_location)
+            shutil.copytree(test_location, default_test_location)
+
+            test_location = default_test_location
+
+            # unset core_root so it can be put in the default location
+            core_root = None
+
+            # Force the core_root to be setup again.
+            args.generate_layout = True
+
+        else:
+            test_location = default_test_location
+
+            print "Using default test location."
+            print "TestLocation: %s" % default_test_location
+            print
 
     if core_root is None:
-        print "Using default location for core_root."
-        core_root = os.path.join(test_location, "Tests", "Core_Root")
+        default_core_root = os.path.join(test_location, "Tests", "Core_Root")
+
+        if os.path.isdir(default_core_root):
+            core_root = default_core_root
+
+            print "Using default location for core_root."
+            print "Core_Root: %s" % core_root
+            print
+
+        elif args.generate_layout is False:
+            # CORE_ROOT has not been setup correctly.
+            print "Error, unable to find CORE_ROOT at %s" % default_core_root
+            print "Please run runtest.py with --generate_layout specified."
+
+            sys.exit(1)
+
+        else:
+            print "--generate_layout passed. Core_Root will be populated at: %s" % default_core_root
+            core_root = default_core_root
+    else:
         print "Core_Root: %s" % core_root
-        print
 
     if host_os != "Windows_NT":
         if test_native_bin_location is None:
@@ -349,33 +919,23 @@ def setup_args(args):
             test_native_bin_location = os.path.join(os.path.join(coreclr_repo_location, "bin", "obj", "%s.%s.%s" % (host_os, arch, build_type), "tests"))
             print "Native bin location: %s" % test_native_bin_location
             print
-
-    valid_arches = ["x64", "x86", "arm", "arm64"]
-    if not arch in valid_arches:
-        print "Unsupported architecture: %s." % arch
-        print "Supported architectures: %s" % "[%s]" % ", ".join(valid_arches)
-        sys.exit(1)
-
-    valid_build_types = ["Debug", "Checked", "Release"]
-    if not build_type in valid_build_types:
-        print "Unsupported configuration: %s." % build_type
-        print "Supported configurations: %s" % "[%s]" % ", ".join(valid_build_types)
-        sys.exit(1)
-
-    if not os.path.isdir(test_location):
-        print "Error, test location: %s, does not exist." % test_location
-        sys.exit(1)
-    
-    if not os.path.isdir(core_root):
-        print "Error, core_root: %s, does not exist." % core_root
-        sys.exit(1)
-
-    if host_os != "Windows_NT":
+            
         if not os.path.isdir(test_native_bin_location):
             print "Error, test_native_bin_location: %s, does not exist." % test_native_bin_location
             sys.exit(1)
 
-    return host_os, arch, build_type, coreclr_repo_location, core_root, test_location, test_native_bin_location
+    if args.product_location is None and args.generate_layout:
+        product_location = os.path.join(coreclr_repo_location, "bin", "Product", "%s.%s.%s" % (host_os, arch, build_type))
+        if not os.path.isdir(product_location):
+            print "Error, unable to determine the product location. This is most likely because build_type was"
+            print "incorrectly passed. Or the product is not built. Please explicitely pass -product_location"
+
+            sys.exit(1)
+
+    else:
+        product_location = args.product_location
+
+    return host_os, arch, build_type, coreclr_repo_location, product_location, core_root, test_location, test_native_bin_location
 
 def setup_tools(host_os, coreclr_repo_location):
     """ Setup the tools for the repo
@@ -392,16 +952,18 @@ def setup_tools(host_os, coreclr_repo_location):
 
     is_windows = host_os == "Windows_NT"
 
-    if os.path.isfile(os.path.join(tools_dir, "msbuild.%s" % ("cmd" if is_windows else "sh"))):
+    dotnetcli_location = os.path.join(coreclr_repo_location, "Tools", "dotnetcli", "dotnet%s" % (".exe" if host_os == "Windows_NT" else ""))
+
+    if os.path.isfile(dotnetcli_location):
         setup = True
     
     # init the tools for the repo
     if not setup:
         command = None
         if is_windows:
-            command = [os.path.join(coreclr_repo_location, "init_tools.cmd")]
+            command = [os.path.join(coreclr_repo_location, "init-tools.cmd")]
         else:
-            command = ["sh", os.path.join(coreclr_repo_location, "init_tools.sh")]
+            command = ["bash", os.path.join(coreclr_repo_location, "init-tools.sh")]
 
         print " ".join(command)
         subprocess.check_output(command)
@@ -410,27 +972,1008 @@ def setup_tools(host_os, coreclr_repo_location):
 
     return setup
 
-################################################################################
-# Main
-################################################################################
+def setup_coredis_tools(coreclr_repo_location, host_os, arch, core_root):
+    """ Setup CoreDisTools if needed
 
-def main(args):
-    host_os, arch, build_type, coreclr_repo_location, core_root, test_location, test_native_bin_location = setup_args(args)
+    Args:
+        coreclr_repo_location(str)  : coreclr repo location
+        host_os(str)                : os
+        arch(str)                   : arch
+        core_root(str)              : core_root
+    """
+
+    test_location = os.path.join(coreclr_repo_location, "tests")
+
+    def is_coredis_tools_supported(host_os, arch):
+        """ Is coredis tools supported on this os/arch
+
+        Args:
+            host_os(str): os
+            arch(str)   : arch
+
+        """
+        unsupported_unix_arches = ["arm", "arm64"]
+
+        if host_os.lower() == "osx":
+            return False
+        
+        return True
+
+        if host_os != "Windows_NT" and arch in unsupported_unix_arches:
+            return False
+
+        return True
+
+    if is_coredis_tools_supported(host_os, arch):
+        command = None
+        if host_os == "Windows_NT":
+            command = [os.path.join(test_location, "setup-stress-dependencies.cmd"), "/arch", arch, "/outputdir", core_root]
+        else:
+            command = [os.path.join(test_location, "setup-stress-dependencies.sh"), "--outputDir=%s" % core_root]
+
+        proc = subprocess.Popen(command)
+        proc.communicate()
+
+        if proc.returncode != 0:
+            print "setup_stress_dependencies.sh failed."
+            sys.exit(1)
+    else:
+        print "GCStress C is not supported on your platform."
+        sys.exit(1)
+
+def precompile_core_root(test_location,
+                         host_os,
+                         arch,
+                         core_root, 
+                         use_jit_disasm=False, 
+                         altjit_name=False):
+    """ Precompile all of the assemblies in the core_root directory
+
+    Args:
+        test_location(str)      : test location
+        host_os(str)            : os
+        core_root(str)          : location of core_root
+        use_jit_disasm(Bool)    : use jit disasm
+        altjit_name(str)        : name of the altjit
+
+    """
+
+    skip_list = [
+        ".*xunit.*",
+        ".*api-ms-win-core.*",
+        ".*api-ms-win.*",
+        ".*System.Private.CoreLib.*"
+    ]
+
+    unix_skip_list = [
+        ".*mscorlib.*",
+        ".*System.Runtime.WindowsRuntime.*",
+        ".*System.Runtime.WindowsRuntime.UI.Xaml.*",
+        ".*R2RDump.dll.*"
+    ]
+
+    arm64_unix_skip_list = [
+        ".*Microsoft.CodeAnalysis.VisualBasic.*",
+        ".*System.Net.NameResolution.*",
+        ".*System.Net.Sockets.*",
+        ".*System.Net.Primitives.*"
+    ]
+
+    if host_os != "Windows_NT":
+        skip_list += unix_skip_list
+    
+        if arch == "arm64":
+            skip_list += arm64_unix_skip_list
+
+    assert os.path.isdir(test_location)
+    assert os.path.isdir(core_root)
+
+    crossgen = os.path.join(core_root, "crossgen%s" % (".exe" if host_os == "Windows_NT" else ""))
+    assert os.path.isfile(crossgen)
+
+    def call_crossgen(file, env):
+        assert os.path.isfile(crossgen)
+        command = [crossgen, "/Platform_Assemblies_Paths", core_root, file]
+
+        if use_jit_disasm:
+            core_run = os.path.join(core_root, "corerun%s" % (".exe" if host_os == "Windows_NT" else ""))
+            assert os.path.isfile(core_run)
+
+            command = [core_run, 
+                       os.path.join(core_root, "jit-dasm.dll"),
+                       "--crossgen",
+                       crossgen,
+                       "--platform", 
+                       core_root, 
+                       "--output",
+                       os.path.join(test_location, "dasm"),
+                       file]
+
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+        proc.communicate()
+
+        return_code = proc.returncode
+
+        passed = False
+        if return_code == -2146230517:
+            print "%s is not a managed assembly." % file
+            return passed
+
+        if return_code != 0:
+            print "Unable to precompile %s" % file
+            return passed
+
+        print "Successfully precompiled %s" % file
+        passed = True
+
+        return passed
+
+    print "Precompiling all assemblies in %s" % core_root
+    print
+
+    env = os.environ.copy()
+
+    if not altjit_name is None:
+        env["COMPlus_AltJit"]="*"
+        env["COMPlus_AltJitNgen"]="*"
+        env["COMPlus_AltJitName"]=altjit_name
+        env["COMPlus_AltJitAssertOnNYI"]="1"
+        env["COMPlus_NoGuiOnAssert"]="1"
+        env["COMPlus_ContinueOnAssert"]="0"
+
+    dlls = [os.path.join(core_root, item) for item in os.listdir(core_root) if item.endswith("dll") and "mscorlib" not in item]
+
+    def in_skip_list(item):
+        found = False
+        for skip_re in skip_list: 
+            if re.match(skip_re, item.lower()) is not None: 
+                found = True
+        return found
+
+    dlls = [dll for dll in dlls if not in_skip_list(dll)]
+
+    for dll in dlls:
+        call_crossgen(dll, env)
+
+    print
+
+def setup_core_root(host_os, 
+                    arch, 
+                    build_type, 
+                    coreclr_repo_location, 
+                    test_native_bin_location,
+                    product_location,
+                    test_location,
+                    core_root,
+                    is_corefx=False,
+                    generate_layout=True):
+    """ Setup the core root
+
+    Args:
+        host_os(str)                : os
+        arch(str)                   : architecture
+        build_type(str)             : build configuration
+        coreclr_repo_location(str)  : coreclr repo location
+        product_location(str)       : Product location
+        core_root(str)              : Location for core_root
+        is_corefx                   : Building corefx core_root
+
+    Optional Args:
+        is_corefx(Bool)             : Pass if planning on running corex
+                                    : tests
+
+    """
+    global g_verbose
+
+    assert os.path.isdir(product_location)
+
+    # Create core_root if it does not exist
+    if os.path.isdir(core_root):
+        shutil.rmtree(core_root)
+        
+    os.makedirs(core_root)
+
+    # Setup the dotnetcli location
+    dotnetcli_location = os.path.join(coreclr_repo_location, "Tools", "dotnetcli", "dotnet%s" % (".exe" if host_os == "Windows_NT" else ""))
+
+    # Set global env variables.
+    os.environ["__BuildLogRootName"] = "Restore_Product"
+
+    if host_os != "Windows_NT":
+        os.environ["__DistroRid"] = "%s-%s" % ("osx" if sys.platform == "darwin" else "linux", arch)
+
+    command = [os.path.join(coreclr_repo_location, "run.%s" % ("cmd" if host_os == "Windows_NT" else "sh")),
+               "build",
+               "-Project=%s" % os.path.join(coreclr_repo_location, "tests", "build.proj")]
+
+    logs_dir = os.path.join(coreclr_repo_location, "bin", "Logs")
+    if not os.path.isdir(logs_dir):
+        os.makedirs(logs_dir)
+
+    log_path = os.path.join(logs_dir, "Restore_Product%s_%s_%s" % (host_os, arch, build_type))
+    build_log = log_path + ".log"
+    wrn_log = log_path + ".wrn"
+    err_log = log_path + ".err"
+
+    msbuild_log_params = "/fileloggerparameters:\"Verbosity=normal;LogFile=%s\"" % build_log
+    msbuild_wrn_params = "/fileloggerparameters1:\"WarningsOnly;LogFile=%s\"" % wrn_log
+    msbuild_err_params = "/fileloggerparameters2:\"ErrorsOnly;LogFile=%s\"" % err_log
+
+    command += ["-MsBuildLog=%s" % msbuild_log_params,
+                "-MsBuildWrn=%s" % msbuild_wrn_params,
+                "-MsBuildErr=%s" % msbuild_err_params]
+
+    if host_os != "Windows_NT":
+        command = ["bash"] + command
+        command += ["-MsBuildEventLogging=\"/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log\""]
+
+    if g_verbose:
+        command += ["-verbose"]
+
+    command += [ "-BatchRestorePackages",
+                 "-BuildType=%s" % build_type,
+                 "-BuildArch=%s" % arch,
+                 "-BuildOS=%s" % host_os]
+
+    print "Restoring packages..."
+    print " ".join(command)
+
+    if not g_verbose:
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    else:
+        proc = subprocess.Popen(command)
+
+    try:
+        proc.communicate()
+    except KeyboardInterrupt:
+        proc.kill()
+        sys.exit(1)
+
+    if proc.returncode == 1:
+        "Error test dependency resultion failed."
+        return False
+
+    os.environ["__BuildLogRootName"] = ""
+
+    # Copy restored packages to core_root
+    # Set global env variables.
+    os.environ["__BuildLogRootName"] = "Tests_Overlay_Managed"
+
+    if host_os != "Windows_NT":
+        os.environ["__DistroRid"] = "%s-%s" % ("osx" if sys.platform == "darwin" else "linux", arch)
+        os.environ["__RuntimeId"] = os.environ["__DistroRid"]
+
+    os.environ["Core_Root"] = core_root
+    os.environ["xUnitTestBinBase"] = os.path.dirname(os.path.dirname(core_root))
+
+    command = [os.path.join(coreclr_repo_location, "run.%s" % ("cmd" if host_os == "Windows_NT" else "sh")),
+               "build",
+               "-Project=%s" % os.path.join(coreclr_repo_location, "tests", "runtest.proj")]
+
+    logs_dir = os.path.join(coreclr_repo_location, "bin", "Logs")
+    if not os.path.isdir(logs_dir):
+        os.makedirs(logs_dir)
+
+    log_path = os.path.join(logs_dir, "Tests_Overlay_Managed%s_%s_%s" % (host_os, arch, build_type))
+    build_log = log_path + ".log"
+    wrn_log = log_path + ".wrn"
+    err_log = log_path + ".err"
+
+    msbuild_log_params = "/fileloggerparameters:\"Verbosity=normal;LogFile=%s\"" % build_log
+    msbuild_wrn_params = "/fileloggerparameters1:\"WarningsOnly;LogFile=%s\"" % wrn_log
+    msbuild_err_params = "/fileloggerparameters2:\"ErrorsOnly;LogFile=%s\"" % err_log
+
+    command += ["-MsBuildLog=%s" % msbuild_log_params,
+                "-MsBuildWrn=%s" % msbuild_wrn_params,
+                "-MsBuildErr=%s" % msbuild_err_params]
+
+    if host_os != "Windows_NT":
+        command = ["bash"] + command
+        command += ["-MsBuildEventLogging=\"/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log\""]
+
+    if g_verbose:
+        command += ["-verbose"]
+
+    command += [ "-testOverlay",
+                 "-BuildType=%s" % build_type,
+                 "-BuildArch=%s" % arch,
+                 "-BuildOS=%s" % host_os]
+
+    print ""
+    print "Creating Core_Root..."
+    print " ".join(command)
+
+    if not g_verbose:
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    else:
+        proc = subprocess.Popen(command)
+
+    try:
+        proc.communicate()
+    except KeyboardInterrupt:
+        proc.kill()
+        sys.exit(1)
+
+    if proc.returncode == 1:
+        "Error test dependency resultion failed."
+        return False
+
+    os.environ["__BuildLogRootName"] = ""
+    os.environ["xUnitTestBinBase"] = ""
+    os.environ["__RuntimeId"] = ""
+
+    def copy_tree(src, dest):
+        """ Simple copy from src to dest
+        """
+        assert os.path.isdir(src)
+        assert os.path.isdir(dest)
+
+        for item in os.listdir(src):
+            if ".nuget" in item:
+                pass
+            item = os.path.join(src, item)
+
+            if os.path.isfile(item):
+                shutil.copy2(item, dest)
+
+                if host_os != "Windows_NT":
+                    # Set executable bit
+                    os.chmod(os.path.join(dest, item), 0774)
+            else:
+                new_dir = os.path.join(dest, os.path.basename(item))
+                if os.path.isdir(new_dir):
+                    shutil.rmtree(new_dir)
+                
+                shutil.copytree(item, new_dir)
+
+    # Copy the product dir to the core_root directory
+    print
+    print "Copying Product Bin to Core_Root:"
+    print "cp -r %s%s* %s" % (product_location, os.path.sep, core_root)
+    copy_tree(product_location, core_root)
+    print "---------------------------------------------------------------------"
+    print
+
+    if is_corefx:
+        corefx_utility_setup = os.path.join(coreclr_repo_location,
+                                            "src",
+                                            "Common",
+                                            "CoreFX",
+                                            "TestFileSetup",
+                                            "CoreFX.TestUtils.TestFileSetup.csproj")
+
+        os.environ["__BuildLogRootName"] = "Tests_GenerateTestHost"
+        msbuild_command = [dotnetcli_location,
+                           "msbuild",
+                           os.path.join(coreclr_repo_location, "tests", "runtest.proj"),
+                           "/p:GenerateRuntimeLayout=true"]
+        proc = subprocess.Popen(msbuild_command)
+        proc.communicate()
+
+        if not proc.returncode == 0:
+            "Error test dependency resultion failed."
+            return False
+
+        os.environ["__BuildLogRootName"] = ""
+
+        msbuild_command = [dotnetcli_location,
+                           "msbuild",
+                           "/t:Restore",
+                           corefx_utility_setup]
+
+        proc = subprocess.Popen(msbuild_command)
+        proc.communicate()
+
+        if proc.returncode == 1:
+            "Error test dependency resultion failed."
+            return False
+
+        corefx_logpath = os.path.join(coreclr_repo_location, 
+                                      "bin", 
+                                      "tests", 
+                                      "%s.%s.%s" % (host_os, arch, build_type), 
+                                      "CoreFX",
+                                      "CoreFXTestUtilities")
+
+        msbuild_command = [dotnetcli_location,
+                           "msbuild",
+                           "/p:Configuration=%s" % build_type,
+                           "/p:OSGroup=%s" % host_os,
+                           "/p:Platform=%s" % arch,
+                           "/p:OutputPath=%s" % corefx_logpath,
+                           corefx_utility_setup]
+
+        proc = subprocess.Popen(msbuild_command)
+        proc.communicate()
+
+        if proc.returncode == 1:
+            "Error test dependency resultion failed."
+            return False
+
+    print "Core_Root setup."
+    print ""
+
+    return True
+
+def delete_existing_wrappers(test_location):
+    """ Delete the existing xunit wrappers
+
+    Args:
+        test_location(str)          : location of the test
+    """
+
+    assert os.path.isdir(test_location) or os.path.isfile(test_location)
+
+    extension = "dll"
+
+    if os.path.isdir(test_location):
+        for item in os.listdir(test_location):
+            delete_existing_wrappers(os.path.join(test_location, item))
+    elif test_location.endswith(extension) and "xunitwrapper" in test_location.lower():
+        # Delete the test wrapper.
+
+        print "rm %s" % test_location
+        os.remove(test_location)
+
+def build_test_wrappers(host_os, 
+                        arch, 
+                        build_type, 
+                        coreclr_repo_location,
+                        test_location):
+    """ Build the coreclr test wrappers
+
+    Args:
+        host_os(str)                : os
+        arch(str)                   : architecture
+        build_type(str)             : build configuration
+        coreclr_repo_location(str)  : coreclr repo location
+        test_location(str)          : location of the test
+
+    Notes:
+        Build the xUnit test wrappers. Note that this will have been done as a
+        part of build-test.cmd/sh. It is possible that the host has a different
+        set of dependencies from the target or the exclude list has changed
+        after building.
+
+    """
+    global g_verbose
+
+    delete_existing_wrappers(test_location)
+
+    # Setup the dotnetcli location
+    dotnetcli_location = os.path.join(coreclr_repo_location, "Tools", "dotnetcli", "dotnet%s" % (".exe" if host_os == "Windows_NT" else ""))
+
+    # Set global env variables.
+    os.environ["__BuildLogRootName"] = "Tests_XunitWrapper"
+    os.environ["__Exclude"] = os.path.join(coreclr_repo_location, "tests", "issues.targets")
+
+    command = [dotnetcli_location,
+               "msbuild",
+               os.path.join(coreclr_repo_location, "tests", "runtest.proj"),
+               "/p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/",
+               "/p:BuildWrappers=true",
+               "/p:TargetsWindows=%s" % ("true" if host_os == "Windows_NT" else "false")]
+
+    logs_dir = os.path.join(coreclr_repo_location, "bin", "Logs")
+    if not os.path.isdir(logs_dir):
+        os.makedirs(logs_dir)
+
+    log_path = os.path.join(logs_dir, "Tests_XunitWrapper%s_%s_%s" % (host_os, arch, build_type))
+    build_log = log_path + ".log"
+    wrn_log = log_path + ".wrn"
+    err_log = log_path + ".err"
+
+    command += ["/fileloggerparameters:\"Verbosity=normal;LogFile=%s\"" % build_log,
+                "/fileloggerparameters1:\"WarningsOnly;LogFile=%s\"" % wrn_log,
+                "/fileloggerparameters2:\"ErrorsOnly;LogFile=%s\"" % err_log,
+                "/consoleloggerparameters:Summary"]
+
+    command += ["/p:__BuildOS=%s" % host_os,
+                "/p:__BuildArch=%s" % arch,
+                "/p:__BuildType=%s" % build_type,
+                "/p:__LogsDir=%s" % logs_dir]
+
+    print "Creating test wrappers..."
+    print " ".join(command)
+
+    if not g_verbose:
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        if not running_in_ci():
+            try:
+                expected_time_to_complete = 60*5 # 5 Minutes
+                estimated_time_running = 0
+
+                time_delta = 1
+
+                while True:
+                    time_remaining = expected_time_to_complete - estimated_time_running
+                    time_in_minutes = math.floor(time_remaining / 60)
+                    remaining_seconds = time_remaining % 60
+
+                    sys.stdout.write("\rEstimated time remaining: %d minutes %d seconds" % (time_in_minutes, remaining_seconds))
+                    sys.stdout.flush()
+
+                    time.sleep(time_delta)
+                    estimated_time_running += time_delta
+
+                    if estimated_time_running == expected_time_to_complete:
+                        break
+                    if proc.poll() is not None:
+                        break
+
+            except KeyboardInterrupt:
+                proc.kill()
+                sys.exit(1)
+    else:
+        proc = subprocess.Popen(command)
+
+    try:
+        proc.communicate()
+    except KeyboardInterrupt:
+        proc.kill()
+        sys.exit(1)
+
+    if proc.returncode == 1:
+        "Error test dependency resultion failed."
+        return False
+
+def find_test_from_name(host_os, test_location, test_name):
+    """ Given a test's name return the location on disk
+
+    Args:
+        host_os (str)       : os
+        test_location (str) :path to the coreclr tests
+        test_name (str)     : Name of the test, all special characters will have
+                            : been replaced with underscores.
+    
+    Return:
+        test_path (str): Path of the test based on its name
+    """
+
+    location = test_name
+
+    # Lambdas and helpers
+    is_file_or_dir = lambda path : os.path.isdir(path) or os.path.isfile(path)
+    def match_filename(test_path):
+        # Scan through the test directory looking for a similar
+        # file
+        global file_name_cache
+
+        if not os.path.isdir(os.path.dirname(test_path)):
+            pass
+
+        assert os.path.isdir(os.path.dirname(test_path))
+        size_of_largest_name_file = 0
+
+        dir_contents = file_name_cache[os.path.dirname(test_path)]
+
+        if dir_contents is None:
+            dir_contents = defaultdict(lambda: None)
+            for item in os.listdir(os.path.dirname(test_path)):
+                dir_contents[re.sub("[%s]" % string.punctuation, "_", item)] = item
+
+            file_name_cache[os.path.dirname(test_path)] = dir_contents
+
+        # It is possible there has already been a match
+        # therefore we need to remove the punctuation again.
+        basename_to_match = re.sub("[%s]" % string.punctuation, "_", os.path.basename(test_path))
+        if basename_to_match in dir_contents:
+            test_path = os.path.join(os.path.dirname(test_path), dir_contents[basename_to_match])
+
+        size_of_largest_name_file = len(max(dir_contents, key=len))
+
+        return test_path, size_of_largest_name_file
+
+    def dir_has_nested_substrings(test_path, test_item):
+        """ A directory has multiple paths where one path is a substring of another
+        """
+
+        dir_contents = file_name_cache[os.path.dirname(test_path)]
+
+        if dir_contents is None:
+            dir_contents = defaultdict(lambda: None)
+            for item in os.listdir(os.path.dirname(test_path)):
+                dir_contents[re.sub("[%s]" % string.punctuation, "_", item)] = item
+
+            file_name_cache[os.path.dirname(test_path)] = dir_contents
+
+        test_item = re.sub("[%s]" % string.punctuation, "_", test_item)
+
+        count = 0
+        for item in dir_contents:
+            if test_item in item:
+                count += 1
+        
+        return count > 1
+
+    # Find the test by searching down the directory list.
+    starting_path = test_location
+    loc_split = location.split("_")
+    append = False
+    for index, item in enumerate(loc_split):
+        if not append:
+            test_path = os.path.join(starting_path, item)
+        else:
+            append = False
+            test_path, size_of_largest_name_file = match_filename(starting_path + "_" + item)
+
+        if not is_file_or_dir(test_path):
+            append = True
+
+        # It is possible that there is another directory that is named
+        # without an underscore.
+        elif index + 1 < len(loc_split) and os.path.isdir(test_path):
+            next_test_path = os.path.join(test_path, loc_split[index + 1])
+
+            if not is_file_or_dir(next_test_path) or dir_has_nested_substrings(test_path, item):
+                added_path = test_path
+                for forward_index in range(index + 1, len(loc_split)):
+                    added_path, size_of_largest_name_file = match_filename(added_path + "_" + loc_split[forward_index])
+                    if is_file_or_dir(added_path):
+                        append = True
+                        break
+                    elif size_of_largest_name_file < len(os.path.basename(added_path)):
+                        break
+        
+        starting_path = test_path
+
+    location = starting_path
+    if not os.path.isfile(location):
+        pass
+    
+    assert(os.path.isfile(location))
+
+    return location
+
+def parse_test_results(host_os, arch, build_type, coreclr_repo_location, test_location):
+    """ Parse the test results for test execution information
+
+    Args:
+        host_os                 : os
+        arch                    : architecture run on
+        build_type              : build configuration (debug, checked, release)
+        coreclr_repo_location   : coreclr repo location
+        test_location           : path to coreclr tests
+
+    """
+    logs_dir = os.path.join(coreclr_repo_location, "bin", "Logs")
+    log_path = os.path.join(logs_dir, "TestRunResults_%s_%s_%s" % (host_os, arch, build_type))
+    print "Parsing test results from (%s)" % log_path
+
+    test_run_location = os.path.join(coreclr_repo_location, "bin", "Logs", "testRun.xml")
+
+    if not os.path.isfile(test_run_location):
+        # Check if this is a casing issue
+
+        found = False
+        for item in os.listdir(os.path.dirname(test_run_location)):
+            item_lower = item.lower()
+            if item_lower == "testrun.xml":
+                # Correct the name.
+                os.rename(os.path.join(coreclr_repo_location, "bin", "Logs", item), test_run_location)
+                found = True
+                break
+
+        if not found:
+            print "Unable to find testRun.xml. This normally means the tests did not run."
+            print "It could also mean there was a problem logging. Please run the tests again."
+
+            return
+
+    if host_os != "Windows_NT" and running_in_ci():
+        # Huge hack.
+        # TODO change netci to parse testRun.xml
+        shutil.copy2(test_run_location, os.path.join(os.path.dirname(test_run_location), "coreclrtests.xml"))
+
+    assemblies = xml.etree.ElementTree.parse(test_run_location).getroot()
+
+    tests = defaultdict(lambda: None)
+    for assembly in assemblies:
+        for collection in assembly:
+            if collection.tag == "errors" and collection.text != None:
+                # Something went wrong during running the tests.
+                print "Error running the tests, please run runtest.py again."
+                sys.exit(1)
+            elif collection.tag != "errors":
+                test_name = None
+                for test in collection:
+                    type = test.attrib["type"]
+                    method = test.attrib["method"]
+
+                    type = type.split("._")[0]
+                    test_name = type + method
+
+                assert test_name != None
+
+                failed = collection.attrib["failed"]
+                skipped = collection.attrib["skipped"]
+                passed = collection.attrib["passed"]
+                time = float(collection.attrib["time"])
+
+                test_output = None
+
+                if failed == "1":
+                    failure_info = collection[0][0]
+
+                    test_output = failure_info[0].text
+
+                test_location_on_filesystem = find_test_from_name(host_os, test_location, test_name)
+
+                assert os.path.isfile(test_location_on_filesystem)
+                
+                assert tests[test_name] == None
+                tests[test_name] = defaultdict(lambda: None, {
+                    "name": test_name,
+                    "test_path": test_location_on_filesystem,
+                    "failed": failed,
+                    "skipped": skipped,
+                    "passed": passed,
+                    "time": time,
+                    "test_output": test_output
+                })
+
+    return tests
+
+def print_summary(tests):
+    """ Print a summary of the test results
+
+    Args:
+        tests (defaultdict[String]: { }): The tests that were reported by 
+                                        : xunit
+    
+    """
+
+    assert tests is not None
+
+    failed_tests = []
+    passed_tests = []
+    skipped_tests = []
+
+    for test in tests:
+        test = tests[test]
+
+        if test["failed"] == "1":
+            failed_tests.append(test)
+        elif test["passed"] == "1":
+            passed_tests.append(test)
+        else:
+            skipped_tests.append(test)
+
+    print
+    print "Total tests run: %d" % len(tests)
+    print
+    print "Total passing tests: %d" % len(passed_tests)
+    print "Total failed tests: %d" % len(failed_tests)
+    print "Total skipped tests: %d" % len(skipped_tests)
+    print
+
+    failed_tests.sort(key=lambda item: item["time"], reverse=True)
+    passed_tests.sort(key=lambda item: item["time"], reverse=True)
+    skipped_tests.sort(key=lambda item: item["time"], reverse=True)
+
+    def print_tests_helper(tests, stop_count):
+        for index, item in enumerate(tests):
+            time = item["time"]
+            unit = "seconds"
+            time_remainder = ""
+            second_unit = ""
+            saved_time = time
+            remainder_str = ""
+
+            # If it can be expressed in hours
+            if time > 60**2:
+                time = saved_time / (60**2)
+                time_remainder = saved_time % (60**2)
+                time_remainder /= 60
+                time_remainder = math.floor(time_remainder)
+                unit = "hours"
+                second_unit = "minutes"
+
+                remainder_str = " %s %s" % (int(time_remainder), second_unit)
+
+            elif time > 60 and time < 60**2:
+                time = saved_time / 60
+                time_remainder = saved_time % 60
+                time_remainder = math.floor(time_remainder)
+                unit = "minutes"
+                second_unit = "seconds"
+
+                remainder_str = " %s %s" % (int(time_remainder), second_unit)
+
+            print "%s (%d %s%s)" % (item["test_path"], time, unit, remainder_str)
+
+            if stop_count != None:
+                if index >= stop_count:
+                    break
+
+    if len(failed_tests) > 0:
+        print "Failed tests:"
+        print
+        print_tests_helper(failed_tests, None)
+        
+
+    if len(passed_tests) > 50:
+        print
+        print "50 slowest passing tests:"
+        print
+        print_tests_helper(passed_tests, 50)
+
+    if len(failed_tests) > 0:
+        print
+        print "#################################################################"
+        print "Output of failing tests:"
+        print
+
+        for item in failed_tests:
+            print "[%s]: " % item["test_path"]
+            print
+            
+            test_output = item["test_output"]
+
+            # XUnit results are captured as escaped, escaped characters.
+            test_output = test_output.replace("\\r", "\r")
+            test_output = test_output.replace("\\n", "\n")
+
+            print test_output
+            print
+
+        print
+        print "#################################################################"
+        print "End of output of failing tests"
+        print "#################################################################"
+        print
+
+def create_repro(host_os, arch, build_type, env, core_root, coreclr_repo_location, tests):
+    """ Go through the failing tests and create repros for them
+
+    Args:
+        host_os (String)                : os
+        arch (String)                   : architecture
+        build_type (String)             : build configuration (debug, checked, release)
+        core_root (String)              : Core_Root path
+        coreclr_repo_location (String)  : Location of coreclr git repo
+        tests (defaultdict[String]: { }): The tests that were reported by 
+                                        : xunit
+    
+    """
+    assert tests is not None
+
+    failed_tests = [tests[item] for item in tests if tests[item]["failed"] == "1"]
+    if len(failed_tests) == 0:
+        return
+    
+    bin_location = os.path.join(coreclr_repo_location, "bin")
+    assert os.path.isdir(bin_location)
+
+    repro_location = os.path.join(bin_location, "repro", "%s.%s.%s" % (host_os, arch, build_type))
+    if os.path.isdir(repro_location):
+        shutil.rmtree(repro_location)
+    
+    print "mkdir %s" % repro_location
+    os.makedirs(repro_location)
+
+    print
+    print "Creating repo files, they can be found at: %s" % repro_location
+
+    assert os.path.isdir(repro_location)
+
+    # Now that the repro_location exists under <coreclr_location>/bin/repro
+    # create wrappers which will simply run the test with the correct environment
+    for test in failed_tests:
+        debug_env = DebugEnv(host_os, arch, build_type, env, core_root, coreclr_repo_location, test)
+        debug_env.write_repro()
+
+    print "Repro files written."
+    print "They can be found at %s" % repro_location
+
+def do_setup(host_os, 
+             arch, 
+             build_type, 
+             coreclr_repo_location, 
+             product_location, 
+             test_location, 
+             test_native_bin_location, 
+             core_root, 
+             unprocessed_args, 
+             test_env):
+    global gc_stress_c
 
     # Setup the tools for the repo.
     setup_tools(host_os, coreclr_repo_location)
 
-    env = get_environment()
-    ret_code = create_and_use_test_env(host_os, 
-                                       env, 
-                                       lambda path: run_tests(host_os, 
-                                                              arch,
-                                                              build_type,
-                                                              core_root, 
-                                                              coreclr_repo_location,
-                                                              test_location, 
-                                                              test_native_bin_location, 
-                                                              test_env=path))
+    if unprocessed_args.generate_layout:
+        success = setup_core_root(host_os, 
+                                  arch, 
+                                  build_type, 
+                                  coreclr_repo_location, 
+                                  test_native_bin_location, 
+                                  product_location,
+                                  test_location, 
+                                  core_root)
+
+        if not success:
+            print "Error GenerateLayout has failed."
+            sys.exit(1)
+
+        if unprocessed_args.generate_layout_only:
+            sys.exit(0)
+
+    if unprocessed_args.precompile_core_root:
+        precompile_core_root(test_location, host_os, arch, core_root, use_jit_disasm=args.jitdisasm, altjit_name=unprocessed_args.crossgen_altjit)
+
+    # If COMPlus_GCStress is set then we need to setup cordistools
+    if gc_stress_c:
+        setup_coredis_tools(coreclr_repo_location, host_os, arch, core_root)
+    
+    # Copy all the native libs to core_root
+    if host_os != "Windows_NT":
+        copy_native_test_bin_to_core_root(host_os, os.path.join(test_native_bin_location, "src"), core_root)
+
+    correct_line_endings(host_os, test_location)
+
+    if unprocessed_args.build_test_wrappers:
+        build_test_wrappers(host_os, arch, build_type, coreclr_repo_location, test_location)
+
+    run_tests(host_os, 
+              arch,
+              build_type,
+              core_root, 
+              coreclr_repo_location,
+              test_location, 
+              test_native_bin_location,
+              is_illink=unprocessed_args.il_link, 
+              is_long_gc=unprocessed_args.long_gc,
+              is_gcsimulator=unprocessed_args.gcsimulator,
+              is_jitdasm=unprocessed_args.jitdisasm,
+              is_ilasm=unprocessed_args.ilasmroundtrip,
+              run_sequential=unprocessed_args.sequential,
+              run_crossgen_tests=unprocessed_args.run_crossgen_tests,
+              test_env=test_env)
+
+################################################################################
+# Main
+################################################################################
+
+def main(args):
+    global g_verbose
+    g_verbose = args.verbose
+
+    host_os, arch, build_type, coreclr_repo_location, product_location, core_root, test_location, test_native_bin_location = setup_args(args)
+
+    env = get_environment(test_env=args.test_env)
+    if not args.analyze_results_only:
+        if args.test_env is not None:
+            ret_code = do_setup(host_os,
+                                arch,
+                                build_type,
+                                coreclr_repo_location,
+                                product_location,
+                                test_location,
+                                test_native_bin_location,
+                                core_root,
+                                args,
+                                args.test_env)
+        else:
+            ret_code = create_and_use_test_env(host_os, 
+                                               env, 
+                                               lambda path: do_setup(host_os,
+                                                                     arch,
+                                                                     build_type,
+                                                                     coreclr_repo_location,
+                                                                     product_location,
+                                                                     test_location,
+                                                                     test_native_bin_location,
+                                                                     core_root,
+                                                                     args,
+                                                                     path))
+        print "Test run finished."
+
+    tests = parse_test_results(host_os, arch, build_type, coreclr_repo_location, test_location)
+
+    if tests is not None:
+        print_summary(tests)
+        create_repro(host_os, arch, build_type, env, core_root, coreclr_repo_location, tests)
 
 ################################################################################
 # __main__
@@ -438,4 +1981,4 @@ def main(args):
 
 if __name__ == "__main__":
     args = parser.parse_args()
-    sys.exit(main(args))
\ No newline at end of file
+    sys.exit(main(args))
diff --git a/tests/runtest.sh b/tests/runtest.sh
index a4631a72c9..614692e4f8 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -6,44 +6,22 @@ function print_usage {
     echo ''
     echo 'Typical command line:'
     echo ''
-    echo 'coreclr/tests/runtest.sh'
-    echo '    --testRootDir="temp/Windows_NT.x64.Debug"'
-    echo '    --testNativeBinDir="coreclr/bin/obj/Linux.x64.Debug/tests"'
-    echo '    --coreOverlayDir="coreclr/bin/tests/Linux.x64.Debug/Tests/Core_Root"'
-    echo '    --copyNativeTestBin'
+    echo 'coreclr/tests/runtest.sh <arch> <configurations>'
     echo ''
-    echo 'Required arguments:'
+    echo 'Optional arguments:'
     echo '  --testRootDir=<path>             : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).'
     echo '  --testNativeBinDir=<path>        : Directory of the native CoreCLR test build (e.g. coreclr/bin/obj/Linux.x64.Debug/tests).'
-    echo '  (Also required: Either --coreOverlayDir, or all of the switches --coreOverlayDir overrides)'
-    echo ''
-    echo 'Optional arguments:'
-    echo '  --coreOverlayDir=<path>          : Directory containing core binaries and test dependencies. If not specified, the'
-    echo '                                     default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,'
-    echo '                                     --mscorlibDir, and --coreFxBinDir.'
+    echo '  --coreOverlayDir=<path>          : Directory containing core binaries and test dependencies.'
     echo '  --coreClrBinDir=<path>           : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).'
-    echo '  --mscorlibDir=<path>             : Directory containing the built mscorlib.dll. If not specified, it is expected to be'
-    echo '                                       in the directory specified by --coreClrBinDir.'
-    echo '  --coreFxBinDir="<path>"          : Directory with CoreFX build outputs'
-    echo '                                     (e.g. "corefx/bin/runtime/netcoreapp-Linux-Debug-x64")'
-    echo '                                     If files with the same name are present in multiple directories, the first one wins.'
-    echo '  --testDir=<path>                 : Run tests only in the specified directory. The path is relative to the directory'
-    echo '                                     specified by --testRootDir. Multiple of this switch may be specified.'
-    echo '  --testDirFile=<path>             : Run tests only in the directories specified by the file at <path>. Paths are listed'
-    echo '                                     one line, relative to the directory specified by --testRootDir.'
     echo '  --build-overlay-only             : Build coreoverlay only, and skip running tests.'
-    echo '  --runFailingTestsOnly            : Run only the tests that are disabled on this platform due to unexpected failures.'
-    echo '                                     Failing tests are listed in coreclr/tests/failingTestsOutsideWindows.txt, one per'
-    echo '                                     line, as paths to .sh files relative to the directory specified by --testRootDir.'
+    echo '  --generateLayoutOnly             : Build Core_Root only and skip running tests'
+    echo '  --generateLayout                 : Force generating layout, even if core_root is passed.'
     echo '  --disableEventLogging            : Disable the events logged by both VM and Managed Code'
     echo '  --sequential                     : Run tests sequentially (default is to run in parallel).'
-    echo '  --playlist=<path>                : Run only the tests that are specified in the file at <path>, in the same format as'
-    echo '                                     runFailingTestsOnly'
     echo '  -v, --verbose                    : Show output from each test.'
     echo '  -h|--help                        : Show usage information.'
     echo '  --useServerGC                    : Enable server GC for this test run'
     echo '  --test-env                       : Script to set environment variables for tests'
-    echo '  --copyNativeTestBin              : Explicitly copy native test components into the test dir'
     echo '  --crossgen                       : Precompiles the framework managed assemblies'
     echo '  --runcrossgentests               : Runs the ready to run tests' 
     echo '  --jitstress=<n>                  : Runs the tests with COMPlus_JitStress=n'
@@ -61,11 +39,9 @@ function print_usage {
     echo '  --gcsimulator                    : Runs the GCSimulator tests'
     echo '  --tieredcompilation              : Runs the tests with COMPlus_TieredCompilation=1'
     echo '  --link <ILlink>                  : Runs the tests after linking via ILlink'
-    echo '  --show-time                      : Print execution sequence and running time for each test'
-    echo '  --no-lf-conversion               : Do not execute LF conversion before running test script'
-    echo '  --limitedDumpGeneration          : Enables the generation of a limited number of core dumps if test(s) crash, even if ulimit'
-    echo '                                     is zero when launching this script. This option is intended for use in CI.'
     echo '  --xunitOutputPath=<path>         : Create xUnit XML report at the specifed path (default: <test root>/coreclrtests.xml)'
+    echo '  --skipXunitWrapperBuild          : Skip creating the xunit wrapper'
+    echo '  --printLastResultsOnly           : Print the results of the last run'
     echo ''
     echo 'CoreFX Test Options '
     echo '  --corefxtests                    : Runs CoreFX tests'
@@ -73,372 +49,6 @@ function print_usage {
     echo '  --corefxtestlist=<path>          : Runs the CoreFX tests specified in the passed list'   
     echo '  --testHostDir=<path>             : Directory containing a built test host including core binaries, test dependencies' 
     echo '                                     and a dotnet executable'
-    echo ''
-    echo 'Runtime Code Coverage options:'
-    echo '  --coreclr-coverage               : Optional argument to get coreclr code coverage reports'
-    echo '  --coreclr-objs=<path>            : Location of root of the object directory'
-    echo '                                     containing the linux/mac coreclr build'
-    echo '  --coreclr-src=<path>             : Location of root of the directory'
-    echo '                                     containing the coreclr source files'
-    echo '  --coverage-output-dir=<path>     : Directory where coverage output will be written to'
-    echo ''
-}
-
-function print_results {
-    echo ""
-    echo "======================="
-    echo "     Test Results"
-    echo "======================="
-    echo "# CoreCLR Bin Dir  : $coreClrBinDir"
-    echo "# Tests Discovered : $countTotalTests"
-    echo "# Passed           : $countPassedTests"
-    echo "# Failed           : $countFailedTests"
-    echo "# Skipped          : $countSkippedTests"
-    echo "======================="
-}
-
-# Initialize counters for bookkeeping.
-countTotalTests=0
-countPassedTests=0
-countFailedTests=0
-countSkippedTests=0
-
-# Variables for xUnit-style XML output. XML format: https://xunit.github.io/docs/format-xml-v2.html
-xunitOutputPath=
-xunitTestOutputPath=
-
-# Variables for text file output. These can be passed back to runtest.sh using the "--playlist" argument
-# to rerun specific tests.
-testsPassOutputPath=
-testsFailOutputPath=
-testsSkipOutputPath=
-
-# libExtension determines extension for dynamic library files
-# runtimeName determines where CoreFX Runtime files will be located
-OSName=$(uname -s)
-libExtension=
-case $OSName in
-    Darwin)
-        libExtension="dylib"
-        ;;
-
-    Linux)
-        libExtension="so"
-        ;;
-
-    NetBSD)
-        libExtension="so"
-        ;;
-
-    *)
-        echo "Unsupported OS $OSName detected, configuring as if for Linux"
-        libExtension="so"
-        ;;
-esac
-
-function xunit_output_begin {
-    if [ -z "$xunitOutputPath" ]; then
-        xunitOutputPath=$testRootDir/coreclrtests.xml
-    fi
-    if ! [ -e $(basename "$xunitOutputPath") ]; then
-        xunitOutputPath=$testRootDir/coreclrtests.xml
-    fi
-    xunitTestOutputPath=${xunitOutputPath}.test
-    if [ -e "$xunitOutputPath" ]; then
-        rm -f -r "$xunitOutputPath"
-    fi
-    if [ -e "$xunitTestOutputPath" ]; then
-        rm -f -r "$xunitTestOutputPath"
-    fi
-}
-
-function xunit_output_add_test {
-    # <assemblies>
-    #   <assembly>
-    #     <collection>
-    #       <test .../> <!-- Write this element here -->
-
-    local scriptFilePath=$1
-    local outputFilePath=$2
-    local testResult=$3 # Pass, Fail, or Skip
-    local testScriptExitCode=$4
-    local testRunningTime=$5
-
-    local testPath=${scriptFilePath%.sh} # Remove trailing ".sh"
-    local testDir=$(dirname "$testPath")
-    local testName=$(basename "$testPath")
-
-    # Replace '/' with '.'
-    testPath=$(echo "$testPath" | tr / .)
-    testDir=$(echo "$testDir" | tr / .)
-
-    local line
-
-    line="      "
-    line="${line}<test"
-    line="${line} name=\"${testPath}\""
-    line="${line} type=\"${testDir}\""
-    line="${line} method=\"${testName}\""
-    line="${line} result=\"${testResult}\""
-    if [ -n "$testRunningTime" ] && [ "$testResult" != "Skip" ]; then
-        line="${line} time=\"${testRunningTime}\""
-    fi
-
-    if [ "$testResult" == "Pass" ]; then
-        line="${line}/>"
-        echo "$line" >>"$xunitTestOutputPath"
-        return
-    fi
-
-    line="${line}>"
-    echo "$line" >>"$xunitTestOutputPath"
-
-    line="        "
-    if [ "$testResult" == "Skip" ]; then
-        line="${line}<reason><![CDATA[$(cat "$outputFilePath")]]></reason>"
-        echo "$line" >>"$xunitTestOutputPath"
-    else
-        line="${line}<failure exception-type=\"Exit code: ${testScriptExitCode}\">"
-        echo "$line" >>"$xunitTestOutputPath"
-
-        line="          "
-        line="${line}<message>"
-        echo "$line" >>"$xunitTestOutputPath"
-        line="            "
-        line="${line}<![CDATA["
-        echo "$line" >>"$xunitTestOutputPath"
-        cat "$outputFilePath" >>"$xunitTestOutputPath"
-        line="            "
-        line="${line}]]>"
-        echo "$line" >>"$xunitTestOutputPath"
-        line="          "
-        line="${line}</message>"
-        echo "$line" >>"$xunitTestOutputPath"
-
-        line="        "
-        line="${line}</failure>"
-        echo "$line" >>"$xunitTestOutputPath"
-    fi
-
-    line="      "
-    line="${line}</test>"
-    echo "$line" >>"$xunitTestOutputPath"
-}
-
-function xunit_output_end {
-    local errorSource=$1
-    local errorMessage=$2
-
-    local errorCount
-    if [ -z "$errorSource" ]; then
-        ((errorCount = 0))
-    else
-        ((errorCount = 1))
-    fi
-
-    echo '<?xml version="1.0" encoding="utf-8"?>' >>"$xunitOutputPath"
-    echo '<assemblies>' >>"$xunitOutputPath"
-
-    local line
-
-    # <assembly ...>
-    line="  "
-    line="${line}<assembly"
-    line="${line} name=\"CoreClrTestAssembly\""
-    line="${line} total=\"${countTotalTests}\""
-    line="${line} passed=\"${countPassedTests}\""
-    line="${line} failed=\"${countFailedTests}\""
-    line="${line} skipped=\"${countSkippedTests}\""
-    line="${line} errors=\"${errorCount}\""
-    line="${line}>"
-    echo "$line" >>"$xunitOutputPath"
-
-    # <collection ...>
-    line="    "
-    line="${line}<collection"
-    line="${line} name=\"CoreClrTestCollection\""
-    line="${line} total=\"${countTotalTests}\""
-    line="${line} passed=\"${countPassedTests}\""
-    line="${line} failed=\"${countFailedTests}\""
-    line="${line} skipped=\"${countSkippedTests}\""
-    line="${line}>"
-    echo "$line" >>"$xunitOutputPath"
-
-    # <test .../> <test .../> ...
-    if [ -f "$xunitTestOutputPath" ]; then
-        cat "$xunitTestOutputPath" >>"$xunitOutputPath"
-        rm -f "$xunitTestOutputPath"
-    fi
-
-    # </collection>
-    line="    "
-    line="${line}</collection>"
-    echo "$line" >>"$xunitOutputPath"
-
-    if [ -n "$errorSource" ]; then
-        # <errors>
-        line="    "
-        line="${line}<errors>"
-        echo "$line" >>"$xunitOutputPath"
-
-        # <error ...>
-        line="      "
-        line="${line}<error"
-        line="${line} type=\"TestHarnessError\""
-        line="${line} name=\"${errorSource}\""
-        line="${line}>"
-        echo "$line" >>"$xunitOutputPath"
-
-        # <failure .../>
-        line="        "
-        line="${line}<failure>${errorMessage}</failure>"
-        echo "$line" >>"$xunitOutputPath"
-
-        # </error>
-        line="      "
-        line="${line}</error>"
-        echo "$line" >>"$xunitOutputPath"
-
-        # </errors>
-        line="    "
-        line="${line}</errors>"
-        echo "$line" >>"$xunitOutputPath"
-    fi
-
-    # </assembly>
-    line="  "
-    line="${line}</assembly>"
-    echo "$line" >>"$xunitOutputPath"
-
-    # </assemblies>
-    echo '</assemblies>' >>"$xunitOutputPath"
-}
-
-function text_file_output_begin {
-    if [ -z "$testsPassOutputPath" ]; then
-        testsPassOutputPath=$testRootDir/coreclrtests.pass.txt
-    fi
-    if ! [ -e $(basename "$testsPassOutputPath") ]; then
-        testsPassOutputPath=$testRootDir/coreclrtests.pass.txt
-    fi
-    if [ -e "$testsPassOutputPath" ]; then
-        rm -f "$testsPassOutputPath"
-    fi
-    if [ -z "$testsFailOutputPath" ]; then
-        testsFailOutputPath=$testRootDir/coreclrtests.fail.txt
-    fi
-    if ! [ -e $(basename "$testsFailOutputPath") ]; then
-        testsFailOutputPath=$testRootDir/coreclrtests.fail.txt
-    fi
-    if [ -e "$testsFailOutputPath" ]; then
-        rm -f "$testsFailOutputPath"
-    fi
-    if [ -z "$testsSkipOutputPath" ]; then
-        testsSkipOutputPath=$testRootDir/coreclrtests.skip.txt
-    fi
-    if ! [ -e $(basename "$testsSkipOutputPath") ]; then
-        testsSkipOutputPath=$testRootDir/coreclrtests.skip.txt
-    fi
-    if [ -e "$testsSkipOutputPath" ]; then
-        rm -f "$testsSkipOutputPath"
-    fi
-}
-
-function text_file_output_add_test {
-    local scriptFilePath=$1
-    local testResult=$2 # Pass, Fail, or Skip
-
-    if [ "$testResult" == "Pass" ]; then
-        echo "$scriptFilePath" >>"$testsPassOutputPath"
-    elif [ "$testResult" == "Skip" ]; then
-        echo "$scriptFilePath" >>"$testsSkipOutputPath"
-    else
-        echo "$scriptFilePath" >>"$testsFailOutputPath"
-    fi
-}
-
-function exit_with_error {
-    local errorSource=$1
-    local errorMessage=$2
-    local printUsage=$3
-
-    if [ -z "$printUsage" ]; then
-        ((printUsage = 0))
-    fi
-
-    echo "$errorMessage"
-    xunit_output_end "$errorSource" "$errorMessage"
-    if ((printUsage != 0)); then
-        print_usage
-    fi
-    exit $EXIT_CODE_EXCEPTION
-}
-
-# Handle Ctrl-C. We will stop execution and print the results that
-# we gathered so far.
-function handle_ctrl_c {
-    local errorSource='handle_ctrl_c'
-
-    echo ""
-    echo "*** Stopping... ***"
-    print_results
-    exit_with_error "$errorSource" "Test run aborted by Ctrl+C."
-}
-
-# Register the Ctrl-C handler
-trap handle_ctrl_c INT
-
-function create_core_overlay {
-    local errorSource='create_core_overlay'
-    local printUsage=1
-
-    if [ -n "$coreOverlayDir" ]; then
-        export CORE_ROOT="$coreOverlayDir"
-
-        if [ -n "$copyNativeTestBin" ]; then
-            copy_test_native_bin_to_test_root $coreOverlayDir
-        fi
-
-        return
-    fi
-
-    # Check inputs to make sure we have enough information to create the core layout. $testRootDir/Tests/Core_Root should
-    # already exist and contain test dependencies that are not built.
-    local testDependenciesDir=$testRootDir/Tests/Core_Root
-    if [ ! -d "$testDependenciesDir" ]; then
-        exit_with_error "$errorSource" "Did not find the test dependencies directory: $testDependenciesDir"
-    fi
-    if [ -z "$coreClrBinDir" ]; then
-        exit_with_error "$errorSource" "One of --coreOverlayDir or --coreClrBinDir must be specified." "$printUsage"
-    fi
-    if [ ! -d "$coreClrBinDir" ]; then
-        exit_with_error "$errorSource" "Directory specified by --coreClrBinDir does not exist: $coreClrBinDir"
-    fi
-
-    # Create the overlay
-    coreOverlayDir=$testRootDir/Tests/coreoverlay
-    export CORE_ROOT="$coreOverlayDir"
-    if [ -e "$coreOverlayDir" ]; then
-        rm -f -r "$coreOverlayDir"
-    fi
-    mkdir "$coreOverlayDir"
-
-    cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    cp -f -p -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    if [ -d "$mscorlibDir/bin" ]; then
-        cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null
-    fi
-    cp -f -v "$testDependenciesDir/"xunit* "$coreOverlayDir/" 2>/dev/null
-    cp -n -v "$testDependenciesDir/"* "$coreOverlayDir/" 2>/dev/null
-    if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then
-        # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows
-        rm -f "$coreOverlayDir/mscorlib.ni.dll"
-    fi
-    if [ -f "$coreOverlayDir/System.Private.CoreLib.ni.dll" ]; then
-        # Test dependencies come from a Windows build, and System.Private.CoreLib.ni.dll would be the one from Windows
-        rm -f "$coreOverlayDir/System.Private.CoreLib.ni.dll"
-    fi
-    copy_test_native_bin_to_test_root $coreOverlayDir
 }
 
 function create_testhost
@@ -516,181 +126,6 @@ function create_testhost
     exit ${exitCode}
 }
 
-declare -a skipCrossGenFiles
-
-function is_skip_crossgen_test {
-    for skip in "${skipCrossGenFiles[@]}"; do
-        if [ "$1" == "$skip" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-function precompile_overlay_assemblies {
-    skipCrossGenFiles=($(read_array "$(dirname "$0")/skipCrossGenFiles.$ARCH.txt"))
-
-    if [ $doCrossgen == 1 ]; then
-        local overlayDir=$CORE_ROOT
-
-        filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -type f )
-        for fileToPrecompile in ${filesToPrecompile}
-        do
-            local filename=${fileToPrecompile}
-            if [ $jitdisasm == 1 ]; then
-                $overlayDir/corerun $overlayDir/jit-dasm.dll --crossgen $overlayDir/crossgen --platform $overlayDir --output $testRootDir/dasm $filename
-                local exitCode=$?
-                if [ $exitCode != 0 ]; then
-                    echo Unable to generate dasm for $filename
-                fi
-            else
-                if is_skip_crossgen_test "$(basename $filename)"; then
-                    continue
-                fi
-                echo Precompiling $filename
-                $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 1> $filename.stdout 2>$filename.stderr
-                local exitCode=$?
-                if [[ $exitCode != 0 ]]; then
-                    if grep -q -e '0x80131018' $filename.stderr; then
-                        printf "\n\t$filename is not a managed assembly.\n\n"
-                    else
-                        echo Unable to precompile $filename.
-                        cat $filename.stdout
-                        cat $filename.stderr
-                        exit $exitCode
-                    fi
-                else
-                    rm $filename.{stdout,stderr}
-                fi
-            fi
-        done
-    else
-        echo Skipping crossgen of FX assemblies.
-    fi
-}
-
-function copy_test_native_bin_to_test_root {
-    local errorSource='copy_test_native_bin_to_test_root'
-    local coreRootDir=$1
-
-    if [ -z "$testNativeBinDir" ]; then
-        exit_with_error "$errorSource" "--testNativeBinDir is required."
-    fi
-    testNativeBinDir=$testNativeBinDir/src
-    if [ ! -d "$testNativeBinDir" ]; then
-        exit_with_error "$errorSource" "Directory specified by --testNativeBinDir does not exist: $testNativeBinDir"
-    fi
-
-    # Copy native test components from the native test build into the respective test directory in the test root directory
-    find "$testNativeBinDir" -type f -iname "*.$libExtension" |
-        while IFS='' read -r filePath || [ -n "$filePath" ]; do
-            local dirPath=$(dirname "$filePath")
-            cp -f "$filePath" "$coreRootDir"
-        done
-}
-
-# Variables for unsupported and failing tests
-declare -a unsupportedTests
-declare -a failingTests
-declare -a playlistTests
-((runFailingTestsOnly = 0))
-
-# Get an array of items by reading the specified file line by line.
-function read_array {
-    local theArray=()
-
-    if [ ! -f "$1" ]; then
-        return
-    fi
-
-    # bash in Mac OS X doesn't support 'readarray', so using alternate way instead.
-    # readarray -t theArray < "$1"
-    # Any line that starts with '#' is ignored.
-    while IFS='' read -r line || [ -n "$line" ]; do
-        if [[ $line != "#"* ]]; then
-            theArray[${#theArray[@]}]=$line
-        fi
-    done < "$1"
-    echo ${theArray[@]}
-}
-
-function load_unsupported_tests {
-    # Load the list of tests that are not supported on this platform. These tests are disabled (skipped) permanently.
-    unsupportedTests=($(read_array "$(dirname "$0")/testsUnsupportedOutsideWindows.txt"))
-    unsupportedTests+=($(read_array "$(dirname "$0")/testsUnsupported.$ARCH.txt"))
-}
-
-function load_failing_tests {
-    # Load the list of tests that fail on this platform. These tests are disabled (skipped) temporarily, pending investigation.
-    failingTests=($(read_array "$(dirname "$0")/testsFailingOutsideWindows.txt"))
-    failingTests+=($(read_array "$(dirname "$0")/testsFailing.$ARCH.txt"))
-}
-
-function load_playlist_tests {
-    # Load the list of tests that are enabled as a part of this test playlist.
-    playlistTests=($(read_array "${playlistFile}"))
-}
-
-function is_unsupported_test {
-    for unsupportedTest in "${unsupportedTests[@]}"; do
-        if [ "$1" == "$unsupportedTest" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-function is_failing_test {
-    for failingTest in "${failingTests[@]}"; do
-        if [ "$1" == "$failingTest" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-function is_playlist_test {
-    for playlistTest in "${playlistTests[@]}"; do
-        if [ "$1" == "$playlistTest" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-function skip_unsupported_test {
-    # This function runs in a background process. It should not echo anything, and should not use global variables. This
-    # function is analogous to run_test, and causes the test to be skipped with the message below.
-
-    local scriptFilePath=$1
-    local outputFilePath=$2
-
-    echo "Not supported on this platform." >"$outputFilePath"
-    return 2 # skip the test
-}
-
-function skip_failing_test {
-    # This function runs in a background process. It should not echo anything, and should not use global variables. This
-    # function is analogous to run_test, and causes the test to be skipped with the message below.
-
-    local scriptFilePath=$1
-    local outputFilePath=$2
-
-    echo "Temporarily disabled on this platform due to unexpected failures." >"$outputFilePath"
-    return 2 # skip the test
-}
-
-function skip_non_playlist_test {
-    # This function runs in a background process. It should not echo anything, and should not use global variables. This
-    # function is analogous to run_test, and causes the test to be skipped with the message below.
-
-    local scriptFilePath=$1
-    local outputFilePath=$2
-
-    echo "Test is not included in the running playlist." >"$outputFilePath"
-    return 2 # skip the test
-}
-
 function set_up_core_dump_generation {
     # We will only enable dump generation here if we're on Mac or Linux
     if [[ ! ( "$(uname -s)" == "Darwin" || "$(uname -s)" == "Linux" ) ]]; then
@@ -717,400 +152,6 @@ function set_up_core_dump_generation {
     fi
 }
 
-function print_info_from_core_file {
-
-    #### temporary
-    if [ "$ARCH" == "arm64" ]; then
-        echo "Not inspecting core dumps on arm64 at the moment."
-        return
-    fi
-    ####
-
-    local core_file_name=$1
-    local executable_name=$2
-
-    if ! [ -e $executable_name ]; then
-        echo "Unable to find executable $executable_name"
-        return
-    elif ! [ -e $core_file_name ]; then
-        echo "Unable to find core file $core_file_name"
-        return
-    fi
-
-    # Use LLDB to inspect the core dump on Mac, and GDB everywhere else.
-    if [[ "$OSName" == "Darwin" ]]; then
-        hash lldb 2>/dev/null || { echo >&2 "LLDB was not found. Unable to print core file."; return; }
-
-        echo "Printing info from core file $core_file_name"
-        lldb -c $core_file_name -b -o 'bt'
-    else
-        # Use GDB to print the backtrace from the core file.
-        hash gdb 2>/dev/null || { echo >&2 "GDB was not found. Unable to print core file."; return; }
-
-        echo "Printing info from core file $core_file_name"
-        gdb --batch -ex "thread apply all bt full" -ex "quit" $executable_name $core_file_name
-    fi
-}
-
-function download_dumpling_script {
-    echo "Downloading latest version of dumpling script."
-    wget "https://dumpling.azurewebsites.net/api/client/dumpling.py"
-
-    local dumpling_script="dumpling.py"
-    chmod +x $dumpling_script
-}
-
-function upload_core_file_to_dumpling {
-    local core_file_name=$1
-    local dumpling_script="dumpling.py"
-    local dumpling_file="local_dumplings.txt"
-
-    # dumpling requires that the file exist before appending.
-    touch ./$dumpling_file
-
-    if [ ! -x $dumpling_script ]; then
-        download_dumpling_script
-    fi
-
-    if [ ! -x $dumpling_script ]; then
-        echo "Failed to download dumpling script. Dump cannot be uploaded."
-        return
-    fi
-
-    echo "Uploading $core_file_name to dumpling service."
-
-    local paths_to_add=""
-    if [ -d "$coreClrBinDir" ]; then
-        echo "Uploading CoreCLR binaries with dump."
-        paths_to_add=$coreClrBinDir
-    fi
-
-    # Ensure the script has Unix line endings
-    perl -pi -e 's/\r\n|\n|\r/\n/g' "$dumpling_script"
-
-    # The output from this will include a unique ID for this dump.
-    ./$dumpling_script "upload" "--dumppath" "$core_file_name" "--incpaths" $paths_to_add "--properties" "Project=CoreCLR" "--squelch" | tee -a $dumpling_file
-}
-
-function preserve_core_file {
-    local core_file_name=$1
-    local storage_location="/tmp/coredumps_coreclr"
-
-    # Create the directory (this shouldn't fail even if it already exists).
-    mkdir -p $storage_location
-
-    # Only preserve the dump if the directory is empty. Otherwise, do nothing.
-    # This is a way to prevent us from storing/uploading too many dumps.
-    if [ ! "$(ls -A $storage_location)" ]; then
-        echo "Copying core file $core_file_name to $storage_location"
-        cp $core_file_name $storage_location
-
-        upload_core_file_to_dumpling $core_file_name
-    fi
-}
-
-function inspect_and_delete_core_files {
-    # This function prints some basic information from core files in the current
-    # directory and deletes them immediately. Based on the state of the system, it may
-    # also upload a core file to the dumpling service.
-    # (see preserve_core_file).
-    
-    # Depending on distro/configuration, the core files may either be named "core"
-    # or "core.<PID>" by default. We will read /proc/sys/kernel/core_uses_pid to 
-    # determine which one it is.
-    # On OS X/macOS, we checked the kern.corefile value before enabling core dump
-    # generation, so we know it always includes the PID.
-    local core_name_uses_pid=0
-    if [[ (( -e /proc/sys/kernel/core_uses_pid ) && ( "1" == $(cat /proc/sys/kernel/core_uses_pid) )) 
-          || ( "$(uname -s)" == "Darwin" ) ]]; then
-        core_name_uses_pid=1
-    fi
-
-    if [ $core_name_uses_pid == "1" ]; then
-        # We don't know what the PID of the process was, so let's look at all core
-        # files whose name matches core.NUMBER
-        for f in core.*; do
-            [[ $f =~ core.[0-9]+ ]] && print_info_from_core_file "$f" $CORE_ROOT/"corerun" && preserve_core_file "$f" && rm "$f"
-        done
-    elif [ -f core ]; then
-        print_info_from_core_file "core" $CORE_ROOT/"corerun"
-        preserve_core_file "core"
-        rm "core"
-    fi
-}
-
-function run_test {
-    # This function runs in a background process. It should not echo anything, and should not use global variables.
-
-    local scriptFilePath=$1
-    local outputFilePath=$2
-
-    # Switch to directory where the script is
-    cd "$(dirname "$scriptFilePath")"
-
-    local scriptFileName=$(basename "$scriptFilePath")
-    local outputFileName=$(basename "$outputFilePath")
-
-    if [ "$limitedCoreDumps" == "ON" ]; then
-        set_up_core_dump_generation
-    fi
-
-    "./$scriptFileName" >"$outputFileName" 2>&1
-    local testScriptExitCode=$?
-
-    # We will try to print some information from generated core dumps if a debugger
-    # is available, and possibly store a dump in a non-transient location.
-    if [ "$limitedCoreDumps" == "ON" ]; then
-        inspect_and_delete_core_files
-    fi
-
-    return $testScriptExitCode
-}
-
-# Variables for running tests in the background
-if [ `uname` = "NetBSD" ]; then
-    NumProc=$(getconf NPROCESSORS_ONLN)
-elif [ `uname` = "Darwin" ]; then
-    NumProc=$(getconf _NPROCESSORS_ONLN)
-else
-    if [ -x "$(command -v nproc)" ]; then
-        NumProc=$(nproc --all)
-    elif [ -x "$(command -v getconf)" ]; then
-        NumProc=$(getconf _NPROCESSORS_ONLN)
-    else
-        NumProc=1
-    fi
-fi
-((maxProcesses = $NumProc * 3 / 2)) # long tests delay process creation, use a few more processors
-
-((processCount = 0))
-declare -a scriptFilePaths
-declare -a outputFilePaths
-declare -a processIds
-declare -a testStartTimes
-waitProcessIndex=
-pidNone=0
-
-function waitany {
-    local pid
-    local exitcode
-    while true; do
-        for (( i=0; i<$maxProcesses; i++ )); do
-            pid=${processIds[$i]}
-            if [ -z "$pid" ] || [ "$pid" == "$pidNone" ]; then
-                continue
-            fi
-            if ! kill -0 $pid 2>/dev/null; then
-                wait $pid
-                exitcode=$?
-                waitProcessIndex=$i
-                processIds[$i]=$pidNone
-                return $exitcode
-            fi
-        done
-        sleep 0.1
-    done
-}
-
-function get_available_process_index {
-    local pid
-    local i=0
-    for (( i=0; i<$maxProcesses; i++ )); do
-        pid=${processIds[$i]}
-        if [ -z "$pid" ] || [ "$pid" == "$pidNone" ]; then
-            break
-        fi
-    done
-    echo $i
-}
-
-function finish_test {
-    waitany
-    local testScriptExitCode=$?
-    local finishedProcessIndex=$waitProcessIndex
-    ((--processCount))
-
-    local scriptFilePath=${scriptFilePaths[$finishedProcessIndex]}
-    local outputFilePath=${outputFilePaths[$finishedProcessIndex]}
-    local scriptFileName=$(basename "$scriptFilePath")
-
-    local testEndTime=
-    local testRunningTime=
-    local header=
-
-    if ((verbose == 1)); then
-        header=$(printf "[%4d]" $countTotalTests)
-    fi
-
-    if [ "$showTime" == "ON" ]; then
-        testEndTime=$(date +%s)
-        testRunningTime=$(( $testEndTime - ${testStartTimes[$finishedProcessIndex]} ))
-        header=$header$(printf "[%4ds]" $testRunningTime)
-    fi
-
-    local testResult
-    case $testScriptExitCode in
-        0)
-            let countPassedTests++
-            testResult='Pass'
-            if ((verbose == 1 || runFailingTestsOnly == 1)); then
-                echo "PASSED   - ${header}${scriptFilePath}"
-            else
-                echo "         - ${header}${scriptFilePath}"
-            fi
-            ;;
-        2)
-            let countSkippedTests++
-            testResult='Skip'
-            echo "SKIPPED  - ${header}${scriptFilePath}"
-            ;;
-        *)
-            let countFailedTests++
-            testResult='Fail'
-            echo "FAILED   - ${header}${scriptFilePath}"
-            ;;
-    esac
-    let countTotalTests++
-
-    if ((verbose == 1 || testScriptExitCode != 0)); then
-        while IFS='' read -r line || [ -n "$line" ]; do
-            echo "               $line"
-        done <"$outputFilePath"
-    fi
-
-    xunit_output_add_test "$scriptFilePath" "$outputFilePath" "$testResult" "$testScriptExitCode" "$testRunningTime"
-    text_file_output_add_test "$scriptFilePath" "$testResult"
-}
-
-function finish_remaining_tests {
-    # Finish the remaining tests in the order in which they were started
-    while ((processCount > 0)); do
-        finish_test
-    done
-}
-
-function prep_test {
-    local scriptFilePath=$1
-    local scriptFileDir=$(dirname "$scriptFilePath")
-
-    test "$verbose" == 1 && echo "Preparing $scriptFilePath"
-
-    if [ ! "$noLFConversion" == "ON" ]; then
-        # Convert DOS line endings to Unix if needed
-        perl -pi -e 's/\r\n|\n|\r/\n/g' "$scriptFilePath"
-    fi
-        
-    # Add executable file mode bit if needed
-    chmod +x "$scriptFilePath"
-
-    #remove any NI and Locks
-    rm -f $scriptFileDir/*.ni.*
-    rm -rf $scriptFileDir/lock
-}
-
-function start_test {
-    local nextProcessIndex=$(get_available_process_index)
-    local scriptFilePath=$1
-    if ((runFailingTestsOnly == 1)) && ! is_failing_test "$scriptFilePath"; then
-        return
-    fi
-
-    # Skip any test that's not in the current playlist, if a playlist was
-    # given to us.
-    if [ -n "$playlistFile" ] && ! is_playlist_test "$scriptFilePath"; then
-        return
-    fi
-
-    if ((nextProcessIndex == maxProcesses)); then
-        finish_test
-        nextProcessIndex=$(get_available_process_index)
-    fi
-
-    scriptFilePaths[$nextProcessIndex]=$scriptFilePath
-    local scriptFileName=$(basename "$scriptFilePath")
-    local outputFilePath=$(dirname "$scriptFilePath")/${scriptFileName}.out
-    outputFilePaths[$nextProcessIndex]=$outputFilePath
-
-    if [ "$showTime" == "ON" ]; then
-        testStartTimes[$nextProcessIndex]=$(date +%s)
-    fi
-
-    test "$verbose" == 1 && echo "Starting $scriptFilePath"
-    if is_unsupported_test "$scriptFilePath"; then
-        skip_unsupported_test "$scriptFilePath" "$outputFilePath" &
-    elif ((runFailingTestsOnly == 0)) && is_failing_test "$scriptFilePath"; then
-        skip_failing_test "$scriptFilePath" "$outputFilePath" &
-    else
-        run_test "$scriptFilePath" "$outputFilePath" &
-    fi
-    processIds[$nextProcessIndex]=$!
-
-    ((++processCount))
-}
-
-# Get a list of directories in which to scan for tests by reading the
-# specified file line by line.
-function set_test_directories {
-    local errorSource='set_test_directories'
-
-    local listFileName=$1
-
-    if [ ! -f "$listFileName" ]
-    then
-        exit_with_error "$errorSource" "Test directories file not found at $listFileName"
-    fi
-    testDirectories=($(read_array "$listFileName"))
-}
-
-function run_tests_in_directory {
-    local testDir=$1
-
-    # Recursively search through directories for .sh files to prepare them.
-    # Note: This needs to occur before any test runs as some of the .sh files
-    # depend on other .sh files
-    for scriptFilePath in $(find "$testDir" -type f -iname '*.sh' | sort)
-    do
-        prep_test "${scriptFilePath:2}"
-    done
-    echo "The tests have been prepared"
-    # Recursively search through directories for .sh files to run.
-    for scriptFilePath in $(find "$testDir" -type f -iname '*.sh' | sort)
-    do
-        start_test "${scriptFilePath:2}"
-    done
-}
-
-function coreclr_code_coverage {
-    local coverageDir="$coverageOutputDir/Coverage"
-    local toolsDir="$coverageOutputDir/Coverage/tools"
-    local reportsDir="$coverageOutputDir/Coverage/reports"
-    local packageName="unix-code-coverage-tools.1.0.0.nupkg"
-
-    rm -rf $coverageDir
-    mkdir -p $coverageDir
-    mkdir -p $toolsDir
-    mkdir -p $reportsDir
-    pushd $toolsDir > /dev/null
-
-    echo "Pulling down code coverage tools"
-    wget -q https://www.myget.org/F/dotnet-buildtools/api/v2/package/unix-code-coverage-tools/1.0.0 -O $packageName
-    echo "Unzipping to $toolsDir"
-    unzip -q -o $packageName
-
-    # Invoke gcovr
-    chmod a+rwx ./gcovr
-    chmod a+rwx ./$OSName/llvm-cov
-
-    echo
-    echo "Generating coreclr code coverage reports at $reportsDir/coreclr.html"
-    echo "./gcovr $coreClrObjs --gcov-executable=$toolsDir/$OS/llvm-cov -r $coreClrSrc --html --html-details -o $reportsDir/coreclr.html"
-    echo
-    ./gcovr $coreClrObjs --gcov-executable=$toolsDir/$OSName/llvm-cov -r $coreClrSrc --html --html-details -o $reportsDir/coreclr.html
-    exitCode=$?
-    popd > /dev/null
-    exit $exitCode
-}
-
 function check_cpu_architecture {
     local CPUName=$(uname -m)
     local __arch=
@@ -1137,6 +178,10 @@ function check_cpu_architecture {
     echo "$__arch"
 }
 
+################################################################################
+# Handle Arguments
+################################################################################
+
 ARCH=$(check_cpu_architecture)
 echo "Running on  CPU- $ARCH"
 
@@ -1146,6 +191,8 @@ readonly EXIT_CODE_EXCEPTION=1     # Script exited because something exceptional
 readonly EXIT_CODE_TEST_FAILURE=2  # Script completed successfully, but one or more tests failed.
 
 # Argument variables
+buildArch=$ARCH
+buildConfiguration="Debug"
 testRootDir=
 testNativeBinDir=
 coreOverlayDir=
@@ -1172,6 +219,10 @@ verbose=0
 doCrossgen=0
 jitdisasm=0
 ilasmroundtrip=
+skipXunitWrapperBuild=
+printLastResultsOnly=
+generateLayoutOnly=
+generateLayout=
 
 for i in "$@"
 do
@@ -1183,6 +234,33 @@ do
         -v|--verbose)
             verbose=1
             ;;
+        x64)
+            buildArch="x64"
+            ;;
+        x86)
+            buildArch="x86"
+            ;;
+        arm)
+            buildArch="arm"
+            ;;
+        arm64)
+            buildArch="arm64"
+            ;;
+        debug|Debug)
+            buildConfiguration="Debug"
+            ;;
+        checked|Checked)
+            buildConfiguration="Checked"
+            ;;
+        release|Release)
+            buildConfiguration="Release"
+            ;;
+        --skipXunitWrapperBuild)
+            skipXunitWrapperBuild=1
+            ;;
+        --printLastResultsOnly)
+            printLastResultsOnly=1
+            ;;
         --crossgen)
             doCrossgen=1
             ;;
@@ -1306,6 +384,12 @@ do
         --build-overlay-only)
             buildOverlayOnly=ON
             ;;
+        --generateLayoutOnly)
+            generateLayoutOnly=1
+            ;;
+        --generateLayout)
+            generateLayout=1
+            ;;
         --limitedDumpGeneration)
             limitedCoreDumps=ON
             ;;
@@ -1320,10 +404,9 @@ do
     esac
 done
 
-if [ -n "$coreOverlayDir" ] && [ "$buildOverlayOnly" == "ON" ]; then
-    echo "Can not use \'--coreOverlayDir=<path>\' and \'--build-overlay-only\' at the same time."
-    exit $EXIT_CODE_EXCEPTION
-fi
+################################################################################
+# Runtests
+################################################################################
 
 if ((disableEventLogging == 0)); then
     export COMPlus_EnableEventLog=1
@@ -1331,6 +414,10 @@ fi
 
 export COMPlus_gcServer="$serverGC"
 
+################################################################################
+# CoreFX
+################################################################################
+
 if [ "$RunCoreFXTests" == 1 ];
 then 
     if [ -z "$coreClrSrc" ]
@@ -1361,157 +448,120 @@ then
     exit 0
 fi
 
+################################################################################
+# Runtest.py
+################################################################################
+
+runtestPyArguments=("-arch" "${buildArch}" "-build_type" "${buildConfiguration}")
+scriptPath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
 if [ -z "$testRootDir" ]; then
-    echo "--testRootDir is required."
-    print_usage
-    exit $EXIT_CODE_EXCEPTION
+    echo "testRootDir and other existing arguments is no longer required. If the "
+    echo "default location is incorrect or does not exist, please use "
+    echo "--testRootDir to explicitly override the defaults."
+
+    echo ""
 fi
-if [ ! -d "$testRootDir" ]; then
-    echo "Directory specified by --testRootDir does not exist: $testRootDir"
-    exit $EXIT_CODE_EXCEPTION
+
+echo "Build Architecture            : ${buildArch}"
+echo "Build Configuration           : ${buildConfiguration}"
+    
+if [ ! -z "$testRootDir" ]; then
+    runtestPyArguments+=("-test_location" "$testRootDir")
+    echo "Test Location                 : ${testRootDir}"
 fi
 
-# Copy native interop test libraries over to the mscorlib path in
-# order for interop tests to run on linux.
-if [ -z "$mscorlibDir" ]; then
-    mscorlibDir=$coreClrBinDir
+if [ ! -z "$coreClrBinDir" ]; then
+    runtestPyArguments+=("-product_location" "$coreClrBinDir")
+    echo "Product Location              : ${coreClrBinDir}"
 fi
 
+if [ -z "$coreOverlayDir" ]; then
+    runtestPyArguments+=("--generate_layout")
+else
+    runtestPyArguments+=("-core_root" "$coreOverlayDir")
+    echo "Core Root Location            : ${coreOverlayDir}"
+fi
+
+if [ ! -z "$testNativeBinDir" ]; then
+    runtestPyArguments+=("-test_native_bin_location" "$testNativeBinDir")
+    echo "Test Native Bin Location      : ${testNativeBinDir}"
+fi
+
+if [ ! -z "${testEnv}" ]; then
+    runtestPyArguments+=("-test_env" "${testEnv}")
+    echo "Test Env                      : ${testEnv}"
+fi
+
+echo ""
+
 if [ ! -z "$longgc" ]; then
     echo "Running Long GC tests"
-    export RunningLongGCTests=1
+    runtestPyArguments+=("--long_gc")
 fi
 
 if [ ! -z "$gcsimulator" ]; then
     echo "Running GC simulator tests"
-    export RunningGCSimulatorTests=1
+    runtestPyArguments+=("--gcsimulator")
 fi
 
 if [[ ! "$jitdisasm" -eq 0 ]]; then
     echo "Running jit disasm"
-    export RunningJitDisasm=1
+    runtestPyArguments+=("--jitdisasm")
 fi
 
 if [ ! -z "$ilasmroundtrip" ]; then
     echo "Running Ilasm round trip"
-    export RunningIlasmRoundTrip=1
+    runtestPyArguments+=("--ilasmroundtrip")
 fi
 
-# If this is a coverage run, make sure the appropriate args have been passed
-if [ "$CoreClrCoverage" == "ON" ]
-then
-    echo "Code coverage is enabled for this run"
-    echo ""
-    if [ ! "$OSName" == "Darwin" ] && [ ! "$OSName" == "Linux" ]
-    then
-        echo "Code Coverage not supported on $OS"
-        exit 1
-    fi
-
-    if [ -z "$coreClrObjs" ]
-    then
-        echo "Coreclr obj files are required to generate code coverage reports"
-        echo "Coreclr obj files root path can be passed using '--coreclr-obj' argument"
-        exit 1
-    fi
-
-    if [ -z "$coreClrSrc" ]
-    then
-        echo "Coreclr src files are required to generate code coverage reports"
-        echo "Coreclr src files root path can be passed using '--coreclr-src' argument"
-        exit 1
-    fi
-
-    if [ -z "$coverageOutputDir" ]
-    then
-        echo "Output directory for coverage results must be specified"
-        echo "Output path can be specified '--coverage-output-dir' argument"
-        exit 1
-    fi
+if [ ! -z "$skipXunitWrapperBuild" ]; then
+    echo "Skipping xunit wrapper build. If build-test was called on a different"
+    echo "host_os or arch the test run will most likely have failures."
+else
+    # By default rebuild the test wrappers, as we cannot gaurentee the following
+    # is true:
+    #   1) There are no added or removed excludes since the tests were built
+    #   2) That the wrapper generation happened on the same host_os and arch
+    #      as where we are running now
+    #
+    # Note that the wrapper generation is slow. To skip this pass --skipXunitWrapperBuild
+    # if the above requirements are met.
+
+    runtestPyArguments+=("--build_xunit_test_wrappers")
 fi
 
-xunit_output_begin
-text_file_output_begin
-create_core_overlay
-precompile_overlay_assemblies
-
-if [ "$buildOverlayOnly" == "ON" ];
-then
-    echo "Build overlay directory '$coreOverlayDir' complete."
-    exit 0
+if (($verbose!=0)); then
+    runtestPyArguments+=("--verbose")
 fi
 
-if [ -n "$playlistFile" ]
-then
-    # Use a playlist file exclusively, if it was provided
-    echo "Executing playlist $playlistFile"
-    load_playlist_tests
-else
-    load_unsupported_tests
-    load_failing_tests
+if [ ! -z "$buildOverlayOnly" ] || [ ! -z "$generateLayoutOnly" ]; then
+    echo "Will only Generate Core_Root"
+    runtestPyArguments+=("--generate_layout_only")
 fi
 
-# Other architectures are not supported yet.
-if [ "$ARCH" == "x64" ]
-then
-    scriptPath=$(dirname $0)
-    ${scriptPath}/setup-stress-dependencies.sh --outputDir=$coreOverlayDir
-elif [ "$ARCH" != "arm64" ] && [ "$ARCH" != "arm" ]; then
-    echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture."
+if [ ! -z "$generateLayout" ]; then
+    runtestPyArguments+=("--generate_layout")
 fi
 
-export __TestEnv=$testEnv
-
-cd "$testRootDir"
-
-dumplingsListPath="$testRootDir/dumplings.txt"
-
-# clean up any existing dumpling remnants from previous runs.
-rm -f "$dumplingsListPath"
-find $testRootDir -type f -name "local_dumplings.txt" -exec rm {} \;
-
-time_start=$(date +"%s")
-if [ -z "$testDirectories" ]
-then
-    # No test directories were specified, so run everything in the current
-    # directory and its subdirectories.
-    run_tests_in_directory "."
-else
-    # Otherwise, run all the tests in each specified test directory.
-    for testDir in "${testDirectories[@]}"
-    do
-        if [ ! -d "$testDir" ]; then
-            echo "Test directory does not exist: $testDir"
-        else
-            run_tests_in_directory "./$testDir"
-        fi
-    done
+if [ ! -z "$sequential" ]; then
+    echo "Run tests sequentially."
+    runtestPyArguments+=("--sequential")
 fi
-finish_remaining_tests
 
-print_results
-
-find $testRootDir -type f -name "local_dumplings.txt" -exec cat {} \; > $dumplingsListPath
-
-if [ -s $dumplingsListPath ]; then
-    cat $dumplingsListPath
-else
-    rm $dumplingsListPath
+if [ ! -z "$printLastResultsOnly" ]; then
+    runtestPyArguments+=("--analyze_results_only")
 fi
 
-time_end=$(date +"%s")
-time_diff=$(($time_end-$time_start))
-echo "$(($time_diff / 60)) minutes and $(($time_diff % 60)) seconds taken to run CoreCLR tests."
-
-xunit_output_end
-
-if [ "$CoreClrCoverage" == "ON" ]
-then
-    coreclr_code_coverage
+if [ ! -z "$RunCrossGen" ]; then
+    runtestPyArguments+=("--run_crossgen_tests")
 fi
 
-if ((countFailedTests > 0)); then
-    exit $EXIT_CODE_TEST_FAILURE
+if (($doCrossgen!=0)); then
+    runtestPyArguments+=("--precompile_core_root")
 fi
 
-exit $EXIT_CODE_SUCCESS
+# Run the tests using cross platform runtest.py
+echo "python ${scriptPath}/runtest.py ${runtestPyArguments[@]}"
+python "${scriptPath}/runtest.py" "${runtestPyArguments[@]}"
+exit "$?"
diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh
index 51a54947e0..ff4231435f 100755
--- a/tests/scripts/arm32_ci_script.sh
+++ b/tests/scripts/arm32_ci_script.sh
@@ -353,7 +353,7 @@ function copy_to_emulator {
 function run_tests {
     sudo chroot $__ARMEmulRootfs /bin/bash -x <<EOF
         cd "$__ARMEmulCoreclr"
-        ./tests/runtest.sh --sequential\
+        ./tests/bringup_runtest.sh --sequential\
                            --testRootDir=$__testRootDirBase \
                            --mscorlibDir=$__mscorlibDirBase \
                            --coreFxNativeBinDir=$__coreFxNativeBinDirBase \
diff --git a/tests/scripts/arm32_ci_test.sh b/tests/scripts/arm32_ci_test.sh
index 3fb36e12ec..80c6b391e0 100755
--- a/tests/scripts/arm32_ci_test.sh
+++ b/tests/scripts/arm32_ci_test.sh
@@ -105,7 +105,7 @@ rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/CoreFxBinDir/libcoreclrtracep
 
 chroot ${__ROOTFS_DIR} /bin/bash -x <<EOF
     cd ${ARM_CHROOT_HOME_DIR}
-    ./tests/runtest.sh --sequential\
+    ./tests/bringup_runtest.sh --sequential\
                        --coreClrBinDir=${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName} \
                        --mscorlibDir=${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName} \
                        --testNativeBinDir=${ARM_CHROOT_HOME_DIR}/bin/obj/${__buildDirName}/tests \
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets
index 5560447363..6d0afc4c9d 100644
--- a/tests/src/CLRTest.Execute.Bash.targets
+++ b/tests/src/CLRTest.Execute.Bash.targets
@@ -69,9 +69,7 @@ WARNING:   When setting properties based on their current state (for example:
     <Message Text="Project depends on $(_CLRTestToRunFileFullPath)." Condition="'$(_CLRTestNeedsProjectToRun)' == 'True'" />
 
     <PropertyGroup>
-      <!-- An exit code of 2 indicates "Skipped" for regular non-windows runs, but "Failed" in Helix -->
-      <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' != 'true'">2</GCBashScriptExitCode>
-      <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' == 'true'">0</GCBashScriptExitCode>
+      <GCBashScriptExitCode>0</GCBashScriptExitCode>
 
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(GCStressIncompatible)' == 'true'"><![CDATA[
 $(BashCLRTestEnvironmentCompatibilityCheck)
@@ -103,6 +101,11 @@ then
   exit $(GCBashScriptExitCode)
 fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
+      <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(TestUnsupportedOutsideWindows)' == 'true'"><![CDATA[
+$(BashCLRTestEnvironmentCompatibilityCheck)
+echo SKIPPING EXECUTION BECAUSE test is unsupported outside Windows.
+exit $(GCBashScriptExitCode)
+      ]]></BashCLRTestEnvironmentCompatibilityCheck>
 
       <BashCLRTestExitCodePrep Condition="$(_CLRTestNeedsToRun)">
 <![CDATA[
@@ -275,8 +278,8 @@ $(BashLinkerTestCleanupCmds)
 $(BashCLRTestLaunchCmds)
 echo export CDPATH="$%28dirname "$0")"
 export CDPATH="$%28dirname "$0")"
-echo /bin/sh -c  $(InputAssemblyName) 
-/bin/sh -c $(InputAssemblyName)
+echo /bin/sh $(InputAssemblyName) 
+/bin/sh $(InputAssemblyName)
 CLRTestExitCode=$?
 CLRTestExpectedExitCode=0
       ]]></BashCLRTestLaunchCmds>
diff --git a/tests/src/CLRTest.GC.targets b/tests/src/CLRTest.GC.targets
index f959aaf6e0..f28eca4b99 100644
--- a/tests/src/CLRTest.GC.targets
+++ b/tests/src/CLRTest.GC.targets
@@ -18,10 +18,7 @@ WARNING:   When setting properties based on their current state (for example:
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-      <!-- An exit code of 2 indicates "Skipped" for regular non-windows runs, but "Failed" in Helix -->
-        <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' != 'true'">2</GCBashScriptExitCode>
-        <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' == 'true'">0</GCBashScriptExitCode>
-
+        <GCBashScriptExitCode>0</GCBashScriptExitCode>
         <GCLongGCTestBashScript Condition="'$(IsLongRunningGCTest)' != 'true'"><![CDATA[
 # Long GC script
 if [ ! -z $RunningLongGCTests ]
diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
index e431f3a333..c946e2e6a6 100644
--- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
+++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
@@ -97,7 +97,6 @@ namespace CoreclrTestLib
         
         // Default timeout set to 10 minutes
         public const int DEFAULT_TIMEOUT = 1000 * 60*10;
-        public const string GC_STRESS_LEVEL = "__GCSTRESSLEVEL";
 
         public const string COLLECT_DUMPS_ENVIRONMENT_VAR = "__CollectDumps";
         public const string CRASH_DUMP_FOLDER_ENVIRONMENT_VAR = "__CrashDumpFolder";
@@ -167,8 +166,6 @@ namespace CoreclrTestLib
             string environmentVar = Environment.GetEnvironmentVariable(TIMEOUT_ENVIRONMENT_VAR);
             int timeout = environmentVar != null ? int.Parse(environmentVar) : DEFAULT_TIMEOUT;
 
-            string gcstressVar = Environment.GetEnvironmentVariable(GC_STRESS_LEVEL);
-
             // Check if we are running in Windows
             string operatingSystem = System.Environment.GetEnvironmentVariable("OS");
             bool runningInWindows = (operatingSystem != null && operatingSystem.StartsWith("Windows"));
@@ -183,13 +180,6 @@ namespace CoreclrTestLib
             using (var errorWriter = new StreamWriter(errorStream))
             using (Process process = new Process())
             {
-                if (gcstressVar!=null)
-                {
-                    //Note: this is not the best way to set the Env, but since we are using 
-                    //Desktop to start the tests, this Env will affect the test harness behavior
-                    process.StartInfo.EnvironmentVariables["COMPlus_GCStress"] = gcstressVar;
-                }
-
                 // Windows can run the executable implicitly
                 if (runningInWindows)
                 {
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj
index d98187877b..2fd387c2a4 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj
@@ -12,6 +12,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj
index 1a383a73b5..599c3d6113 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj
@@ -12,6 +12,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj
index 0f358866a4..2fe258684b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj
@@ -8,6 +8,10 @@
     <ProjectGuid>{742D9E05-668D-4B90-97F9-717A7572FE6C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj
index 920d19f214..13c106880f 100644
--- a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj
+++ b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj
@@ -12,6 +12,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj
index 6464b17f3b..e9e5186cfe 100644
--- a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj
+++ b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj
@@ -12,6 +12,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/Coverage/smalloom.csproj b/tests/src/GC/Coverage/smalloom.csproj
index 5d12fc2fb7..225b744160 100644
--- a/tests/src/GC/Coverage/smalloom.csproj
+++ b/tests/src/GC/Coverage/smalloom.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj b/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj
index 0277100513..979bccfd40 100644
--- a/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj
+++ b/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj
@@ -10,6 +10,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test will timeout on Unix -->
+    <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj b/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj
index a10bed150d..40839267f3 100644
--- a/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj
@@ -10,6 +10,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test will timeout on Unix -->
+    <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
index 0bb40d739b..094bea9063 100644
--- a/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
+++ b/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
@@ -10,9 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{209912F9-0DA1-4184-9CC1-8D583BAF4A28};{87799F5D-CEBD-499D-BDBA-B2C6105CD766}</ProjectTypeGuids>
     <ApplicationManifest>App.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DisableProjectBuild Condition="'$(TargetsWindows)' != 'true'">true</DisableProjectBuild>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj b/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
index b02b40ca2b..6615490757 100644
--- a/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
+++ b/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
+    
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Interop/SizeConst/SizeConstTest.csproj b/tests/src/Interop/SizeConst/SizeConstTest.csproj
index 3d333736f9..d8718bd907 100644
--- a/tests/src/Interop/SizeConst/SizeConstTest.csproj
+++ b/tests/src/Interop/SizeConst/SizeConstTest.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
+    
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
diff --git a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
index 56484d4aac..2a38e61fbe 100644
--- a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
+++ b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
@@ -13,6 +13,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
index f91fe08429..06f8aa889b 100644
--- a/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
+++ b/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
index 59f063e83f..1a54638c33 100644
--- a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
+++ b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/RVAInit/extended.ilproj b/tests/src/JIT/Directed/RVAInit/extended.ilproj
index b760bfe130..ceee9feab2 100644
--- a/tests/src/JIT/Directed/RVAInit/extended.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/extended.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/RVAInit/overlap.ilproj b/tests/src/JIT/Directed/RVAInit/overlap.ilproj
index e0d8699c02..edac1051d3 100644
--- a/tests/src/JIT/Directed/RVAInit/overlap.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/overlap.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj
index 7bf84d4d23..e65be2c3cb 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj
index 74af92dfd3..4e26179428 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj
index c1531e9981..756cb493a9 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj
index d44913ee5e..14b453f364 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
index 1a95d06324..8b46a1108b 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
index 51fc8ca58e..488abd841b 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
index db1f6d2576..9f9a0fec42 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
index 3110cd22ea..9eb3d4dc55 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
index 42ca4d643a..15c5250d23 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
index 9df84e4fb9..23de8ebd64 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
index 75fd194638..520b055be4 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
index 8425399eda..c775fc6389 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj b/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
index 88f2d6b4fb..05307fdbde 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
index 7bafa42efb..04d0eef8c0 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
index d0a33c9429..2ff4801a0c 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
index 698d0015de..7ba339ab02 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
index 466559cad9..2b9c717398 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj b/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
index 35d185a386..138068f328 100644
--- a/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/jump.ilproj b/tests/src/JIT/Directed/pinvoke/jump.ilproj
index 56b98933c4..dfc750c0d4 100644
--- a/tests/src/JIT/Directed/pinvoke/jump.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/jump.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
index d63f700379..dc790f93b0 100644
--- a/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
+++ b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj b/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
index 3b273fab4d..c53e99d772 100644
--- a/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
+++ b/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj b/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
index 20f0994841..13709460e7 100644
--- a/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/sin.csproj b/tests/src/JIT/Directed/pinvoke/sin.csproj
index b467bae0e8..96d7e9d15f 100644
--- a/tests/src/JIT/Directed/pinvoke/sin.csproj
+++ b/tests/src/JIT/Directed/pinvoke/sin.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj b/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
index b7bfffb2a5..195f64d1ff 100644
--- a/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
+++ b/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj b/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
index c522536a16..0619cd2921 100644
--- a/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinvoke/tail.ilproj b/tests/src/JIT/Directed/pinvoke/tail.ilproj
index 3f00df9d37..45e12b0d20 100644
--- a/tests/src/JIT/Directed/pinvoke/tail.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/tail.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
index d8fc5f5da3..51b199fe72 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
index 9b8f43dc7d..76bb474b54 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
index 905335f29f..496ea3a094 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
index d93887501e..983fd8fcf3 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
index 5e8db6395b..ded7b0d0d2 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj b/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
index 77a02ef230..3c164cab4f 100644
--- a/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
+++ b/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on tls support see #2441 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Directed/tls/test-tls.ilproj b/tests/src/JIT/Directed/tls/test-tls.ilproj
index e08518b00d..7e8d3e066b 100644
--- a/tests/src/JIT/Directed/tls/test-tls.ilproj
+++ b/tests/src/JIT/Directed/tls/test-tls.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on tls support see #2441 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj b/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
index ac84fe97a2..67f5640c47 100644
--- a/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
+++ b/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Generics/pinvoke/instance01.csproj b/tests/src/JIT/Generics/pinvoke/instance01.csproj
index 204e6256be..fbda58b7c8 100644
--- a/tests/src/JIT/Generics/pinvoke/instance01.csproj
+++ b/tests/src/JIT/Generics/pinvoke/instance01.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Generics/pinvoke/instance02.csproj b/tests/src/JIT/Generics/pinvoke/instance02.csproj
index 2f0fa0e8bc..4c5299049a 100644
--- a/tests/src/JIT/Generics/pinvoke/instance02.csproj
+++ b/tests/src/JIT/Generics/pinvoke/instance02.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Generics/pinvoke/instance03.csproj b/tests/src/JIT/Generics/pinvoke/instance03.csproj
index 6065c48163..8ae4b0a753 100644
--- a/tests/src/JIT/Generics/pinvoke/instance03.csproj
+++ b/tests/src/JIT/Generics/pinvoke/instance03.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Generics/pinvoke/static01.csproj b/tests/src/JIT/Generics/pinvoke/static01.csproj
index 0d2ad1249b..a8d0135714 100644
--- a/tests/src/JIT/Generics/pinvoke/static01.csproj
+++ b/tests/src/JIT/Generics/pinvoke/static01.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Generics/pinvoke/static02.csproj b/tests/src/JIT/Generics/pinvoke/static02.csproj
index 5049b07211..0d0cabcf1f 100644
--- a/tests/src/JIT/Generics/pinvoke/static02.csproj
+++ b/tests/src/JIT/Generics/pinvoke/static02.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj b/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
index e955807e56..96ab267f6a 100644
--- a/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj b/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
index 8024636ea3..0a54f7d8b5 100644
--- a/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
index 4f54d9f4b0..fa45ece123 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- #2444 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
index 0ded8304d0..26357394e3 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- #2444 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj
index 57e09e18e7..46b9ab4e7a 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj
index 95b48e3877..02f2ea65d5 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj
index f33ccb8b95..77ed359ca3 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj
index 364a86c231..069b60b752 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj
index 0f1627b057..39f90314da 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj
index f25107dee3..07f5c5edc3 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj
index 1237990e23..894825dca1 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj
index 9beec0ce9d..ad37a58f92 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj
index e999b97a71..e0eabce6d3 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj
index b471590f7c..0b36f15c1b 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj
index fa6cb4ceef..4231e6799b 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj
index da8c547870..c882be5321 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj
index f346359c09..ccf4fc0291 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj
index 15e392ed6c..a925e5de8d 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj
index 33684a999f..4622d7bb9e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj
index 8a491c3ccf..d127438ca9 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj
index a6a09ce82d..578b4d67ee 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj
index 1518108329..64aee6d1b2 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj
index 2c12738a5e..ec7340a44c 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj
index b4fd9b9c0c..852192bd43 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj
index cc6db5b6e7..646dd9632c 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+  
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj
index 4915874c6b..3a26adf369 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj
index 44720bdadb..ce8dab8d19 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj
index 92639917ae..e934259487 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj
index 7a3a22f551..eaa8d6943d 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj
index 5ba095a4c8..e968c94abb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj
index a744c5c9d0..a187787b9a 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj
index d6c6193413..bf60fa8b17 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj
index 31e7837631..4077cb7856 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj
index 34e57bf7a8..64f5ad2b8e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj
index 18d6bbad1c..e235345ed4 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj
index ea71f3e8ba..1871e28835 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj
index 887797e3a7..9870d3a724 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj
index f48e0a3b9e..4a647d2ce6 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj
index ae6f842036..450dbe443d 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj
index 3a9feed340..0bb8b46d05 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj
index 434e98b66e..806adadb9b 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj
index b2ea622f17..c09562b99a 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj
index 036e0608e9..15bb2f0c58 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+    
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj
index 75f2b4166f..e7ddf16b55 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj
index a3eb9f5e2a..9b0fc200be 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj
index bc8e0200ce..f3e5f99326 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj
index 3451a12e8b..7d1edd786b 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj
index 5642a0ab70..fbf0e2cc56 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj
index 518ded14a4..b9f86856e1 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+    
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj
index 7ac731c2b0..4aee1cbc04 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj
index 26bab64ca9..a85e7f0243 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj
index 87a35f2837..f523c18fc1 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj
index 01e4d644a9..7cde0d9ed4 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj
index 62920a9a6a..0b85f2fd02 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj
index 7cacea7e29..b760ed05d2 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj
index 86c0723a1c..fdb045fd1c 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj
index e28c957e69..52569b9444 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj
index 3c78064170..0452b9cee6 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj
index c26e68bc38..9001cfd91f 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj
index 49b92fb27e..8091795052 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj
index 5af197febc..5bbe27e8b3 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj
index 2b113545de..da666277f7 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj
index 4f4bb158d1..9830ff51df 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj
index 0ac43dcea2..4dc9a5171e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj
index 6c2cb27645..990a926144 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj
index 9dd538dbfe..059b624673 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj
index a914bea349..14b8c69cee 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj
index 2b2ade5d91..4c7548557d 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
index 634f34a27b..4c721cf574 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
index f26becade4..8795713dd9 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
index 5f03b1fd81..795b964fdf 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
index 13a4ebb9ff..53c40d3b61 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
index 420692e283..a338809dbf 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- #2444 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
index f99329a0c3..0663dd8567 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- #2444 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
index fd2beb14c9..9c5d30e3b8 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on tls support see #2441 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
index ff863cf7f6..8a40c155cc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
index 41d11997c5..d328463d58 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
index 952931b6eb..93e9326b1b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
index eff989c03c..b0b589059d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
index ac0c983822..64cbef6436 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
index c3fe21506b..78b2ad2fbf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows, uses native varargs -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
index 78010e59dd..f801161000 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
index a15a6bbee1..2119b71396 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
index ddb5cbd509..370f644d15 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
index 76615bc606..9fe0428575 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
index 6df2d0063f..bb3b87e4d7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
index df9593a79c..53826d6c50 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
index 0a65dc6de1..4b4027e8e4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
index 82daf38482..6bbee1e226 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
index 7d4c5344ff..084ab41624 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
index b021b31636..a53f73f208 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
index 3034d902ca..f8928a5581 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on tls support see #2441 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
index b8784dc2f8..ea236aa526 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- #4849 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
index eb9a1dad35..5b89ff0faf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows, uses native varargs -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj b/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
index aac5aa4ea8..f20d1e4888 100644
--- a/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
+++ b/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- #2445 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_17777/GitHub_17777.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_17777/GitHub_17777.csproj
index 5bd417ae6c..272e875d68 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_17777/GitHub_17777.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_17777/GitHub_17777.csproj
@@ -14,6 +14,9 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+
+    <!-- Timeout on Arm64 -->
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
index 0f1c133187..2f7bdaae22 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
index 66c7a74d73..b072e953f0 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on rva_statics support see #2451 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
index a1d2d499c1..da2f6f643d 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
index cd6637377c..5eb287d2ba 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
index 6e4aa76ce8..66b4fa3bdf 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
@@ -13,6 +13,10 @@
 
     <!-- This test takes a long time to run; exclude it by default -->
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/gc/misc/funclet.csproj b/tests/src/JIT/jit64/gc/misc/funclet.csproj
index 5dc7e50025..7ab17cc627 100644
--- a/tests/src/JIT/jit64/gc/misc/funclet.csproj
+++ b/tests/src/JIT/jit64/gc/misc/funclet.csproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj b/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
index 25820075fd..fc9f280829 100644
--- a/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj b/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
index 9c97121256..1182f98c34 100644
--- a/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj b/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
index 6803b3f775..014796d8cb 100644
--- a/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj
index aafaca3686..b5f25d3ea5 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj
index 9c445a6713..4102fed941 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+    
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj
index 43580c7a72..a65947da67 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj
index 8961104760..978de3f1d5 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj
index 8cb2b9bf6e..7b530a7f83 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj
index bc18ec8c26..8b0ef2d52e 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj
index 4927701d58..690142ba7d 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj
index 8ed3ebac5c..f65d6e0e18 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj
index f970593e98..053d45dd66 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj
index e0159627ad..fae559f903 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj
index 23d16ec500..aa8d74d31b 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj
index 9d0b68b148..9442042af3 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj
index 8445bdaa98..c578736730 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj
index 01991bd1ec..0df7c51e96 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj
index b8394e6933..3db24063c6 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj
index 75e291ca3e..1636d099de 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj
index 4460df7bb3..ac2a476516 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj
index 6a5b859f63..56ef1e2fd9 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj
index 6b367a016c..91d4833c59 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj
index c6fd8accfa..45e4d7df1c 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj
index 546e95fc17..166c08f503 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj
index 019c1a5e80..577da7279b 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj
index 2b7c93deb2..aa41c4355f 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj
index 6769938a11..5936a1ac83 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj
index 298bde1ba2..b604120d10 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj
index 50195cfd66..63f1df7c78 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj
index cce1234b10..6e69083db5 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj
index cf80fb5077..0784271439 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj
index 21b4c7bbc8..a125e6ed99 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj
index c15d024859..3f3ed3737a 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj
index 2c3705afc8..a12a1f14ab 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj
index 3306d1f1d7..5e130a3c1e 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows uses native varargs -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj
index 875a398e96..16e1e56580 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj
index ba54aac871..2669a5ceb9 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj
index 07fdbd5126..a9cbbce326 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj
index cef4778ff3..79b555f2db 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj
index 6d4b787c5e..771aca90ec 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj
index d24686cfff..9de92883ab 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj
index 4be027f3bf..5c9f301b7f 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj
index ef9996d567..28c3d2cafe 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj
index 65c1a8176a..1bb6ab6c52 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj
index 281f275a82..f7cc5d3806 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj
index 436dda1dd7..2a4a4c367e 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj
index 7e86001f0b..abe6c535f0 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj
index 2de84d35f5..021eca2cac 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj
index 8a312cac76..ca9ca92890 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj
index 478afc5f88..0be1d28c5c 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj
index b8296515f1..d675576b8d 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj
index 9d3f6e0938..a63de2312c 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj
index 043c0f3d72..0d10d0bb6c 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj
index 0cd0fb1e83..b78d437876 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj
index a56fae22e5..ae0e47d158 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj
index b1c1b0475c..94898c19d7 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj
index b690ba91f0..5096492b0f 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj
index 16af55fcc3..b42ba9fcea 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj
@@ -10,6 +10,10 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
index 07365609ec..0784ebdd29 100644
--- a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
@@ -10,6 +10,9 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Timeout on Arm64 -->
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
index fde489d9f4..992ac1c522 100644
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
@@ -10,6 +10,9 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <!-- Timeout on Arm64 -->
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj b/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
index 50f2b455b0..36ce9e3afe 100644
--- a/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
+++ b/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
@@ -11,6 +11,9 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test relies on Verifier support see #4851 -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj b/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
index b1788a5a35..47af718200 100644
--- a/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
@@ -12,6 +12,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
diff --git a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
index 169e8aed37..dd5c6bb0f3 100644
--- a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
+++ b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
@@ -11,6 +11,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
  </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/coreclr/0584/Test584.csproj b/tests/src/Regressions/coreclr/0584/Test584.csproj
index 65a6eb8138..431ef3283d 100644
--- a/tests/src/Regressions/coreclr/0584/Test584.csproj
+++ b/tests/src/Regressions/coreclr/0584/Test584.csproj
@@ -12,6 +12,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj b/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
index ca6facd765..4feae8cbce 100644
--- a/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
+++ b/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
@@ -12,6 +12,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!--Test unsupported uses rva_statics -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
index a473e87c80..882764f9d8 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
@@ -12,6 +12,9 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!--Test unsupported uses rva_statics -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj b/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
index fe215363fa..d3142735ff 100644
--- a/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
+++ b/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
@@ -12,6 +12,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
index 5b221edb1a..1938baaa01 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
@@ -12,6 +12,10 @@
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:10 /pos:0</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
index 1ee5aac442..68409e01e5 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
@@ -12,6 +12,10 @@
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:63</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
index f439180bea..a689180044 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
index 2456bb8e45..7660c8de57 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
index 804b758c69..2f7bf9d8b5 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
index 37a09059d7..3998bd0014 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
index e7a6eba461..f91785574c 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
index e5136f995d..e626463cb9 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
index 3c718facea..1bc0e8c665 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
index 21a481cced..fe01bb8bdc 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
index 91d4792eb9..7810ed5781 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
index 042084ab86..14de86a7fc 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
index 02906017e3..fc86ed5d29 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
index 2fd73f9aed..eb655b6f12 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
index a432e1f8b3..2e7db2880e 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
index c0a6aeb97e..40e1136117 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
index f219be1282..beecf83af5 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj b/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj
index a45b526a88..44114682a6 100644
--- a/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj
+++ b/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
index 3301e9e6f8..cdb3297c65 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:0 /mCount:1 /semName:MySemaphoreName</CLRTestExecutionArguments>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
index 061528bc54..0494fecc4a 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:10 /mCount:10 /semname:abcdefghijklmnopqrstuvwxyz</CLRTestExecutionArguments>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
index 7273b602dc..14a554d1cb 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:3 /mCount:5 /iRandom:260</CLRTestExecutionArguments>
+    
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
index 4ceecac734..760e56c86e 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:2147483647 /mCount:2147483647 /iRandom:220</CLRTestExecutionArguments>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
index 2384490b58..6bf5930fe4 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
index db61bfc0bd..955e8e8ae4 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
index 7ad6cd105a..07e35cf868 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
index d69032eb72..8ab7a32c52 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
index 15b1ff59cb..34ba4e327f 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
index 817aca2ae0..5f401a226b 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
index 2155e221a2..b2e5f25319 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/semaphore/unit/semtest.csproj b/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
index 48ce59c2a4..91a6ffd110 100644
--- a/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
+++ b/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
index cafede0e80..b76a4e4861 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
index 4936eb1c91..18ff388c35 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
index 40a45e3562..e0df254863 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
index b4680468a9..2c5d161c1e 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
index f612e480db..bf9bd985b2 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
index 3bd9e99769..d5ddd04bd2 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
index 64bc02b7c1..7239c414dd 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
index 1afd2ab08f..973d2b52d9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
@@ -12,6 +12,10 @@
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:63</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
index 8e16927f4c..e2a47fc853 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
index 2402f87dd8..c7fbc269a9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
index 96103d0a3b..23eda26db1 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
index 3384e91a20..8eb3b5acd9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
index 64c39d767a..7c89c3685f 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
index 8fe852d358..0d80f5a9a1 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
@@ -12,6 +12,10 @@
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:0</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
index 98af403de8..ba160f7f7a 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
index f871aa6ee8..3ab4ca2438 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
index 96cc5ebf50..23b2d204e3 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
index f1de7e9d9f..dacc4e1fd7 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:63</CLRTestExecutionArguments>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
index ebbfc6f9f1..2d647dfb41 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
index 0ce38e9735..833c64246c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
@@ -12,6 +12,10 @@
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
index 00d6b1f86c..3eb5062360 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
index f5d085809a..b770b216d4 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
index e2ff2e100c..b6dcbc1191 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
index e258251897..ac57e6231c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
index f668197ff9..e1a3aad3f8 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
index de9c88c44d..bd55fe9e1e 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
index d49015a362..0f8c05e367 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
index ab055d1f54..4811890ac8 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
index 9f17ad6e23..dabb01e94a 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
@@ -12,6 +12,10 @@
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
index 071412e0bd..a055dad299 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
index 79649b4897..bba539ccdd 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
index 176e3f5a65..0ffbf62614 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
@@ -11,6 +11,10 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
index a3c992cd42..ecc910bcfd 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
@@ -10,6 +10,10 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestPriority>1</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/managed/Compilation/Compilation.csproj b/tests/src/managed/Compilation/Compilation.csproj
index 7a2b31bb28..e0c369e9c6 100644
--- a/tests/src/managed/Compilation/Compilation.csproj
+++ b/tests/src/managed/Compilation/Compilation.csproj
@@ -13,6 +13,10 @@
 
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <GCStressIncompatible>true</GCStressIncompatible>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/tests/src/readytorun/r2rdump/R2RDumpTest.csproj
index 104f2291c8..410620a6eb 100644
--- a/tests/src/readytorun/r2rdump/R2RDumpTest.csproj
+++ b/tests/src/readytorun/r2rdump/R2RDumpTest.csproj
@@ -16,7 +16,11 @@
     <BashR2RDumpCommand>$(BashCoreClrDir)bin/Product/$(BuildOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll</BashR2RDumpCommand>
     <BashDotnetToolCommand>$(BashCoreClrDir)Tools/dotnetcli/dotnet</BashDotnetToolCommand>
     <CLRTestExecutionArguments>$(CoreClrDir)tests\src\readytorun\r2rdump\files\$(BuildOS).$(BuildArch).$(BuildType)\</CLRTestExecutionArguments>
-    <DisableProjectBuild Condition=" '$(Platform)' == 'arm64' or '$(Platform)' == 'arm' ">true</DisableProjectBuild>
+  
+    <!-- Test unsupported outside of windows -->
+    <!-- Test unsupported on arm targets -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition=" '$(Platform)' == 'arm64' or '$(Platform)' == 'arm' or '$(TargetsUnix)' == 'true' ">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj b/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
index 31c9137ca3..d8e0b99d38 100644
--- a/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
+++ b/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
@@ -13,6 +13,10 @@
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>0</CLRTestPriority>
+
+    <!-- Test unsupported outside of windows -->
+    <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
+    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
diff --git a/tests/tests.targets b/tests/tests.targets
index e1e6f58ba8..6c3afcd7f1 100644
--- a/tests/tests.targets
+++ b/tests/tests.targets
@@ -65,7 +65,7 @@
       <XunitCommandLine>$(CorerunExecutable) $(XunitConsoleRunner) @(TestAssemblies->'%(Identity)', ' ') $(XunitArgs)</XunitCommandLine>
     </PropertyGroup>
 
-    <Error Condition="$(XunitCommandLine.Length) > 8191" Text="Xunit command line is too long." />
+    <Error Condition="$(XunitCommandLine.Length) > 8191 and '$(RunningOnUnix)' != 'true'" Text="Xunit command line is too long." />
     <Exec Command="$(XunitCommandLine)"
           WorkingDirectory="$(BaseOutputPathWithConfig)"/>