Merge pull request #11860 from rartemev/fix_tests_build_4

Fixed tests build on Linux
author: Roman Artemev <rartemev@microsoft.com> 2017-06-01 12:27:23 -0700
committer: GitHub <noreply@github.com> 2017-06-01 12:27:23 -0700
commit: f86fd75c111fc28554f1c846a8abc472cc2f67b6 (patch)
tree: 43010c7bfde2f634d15de8006a734993798d8ffb
parent: 148d418dca9045167e1e5b74129faa78d9c5ed73 (diff)
parent: df8dca2f2f3a5dd22b9db727e581a3c13fbe403a (diff)
download: coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.tar.gz
coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.tar.bz2
coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.zip
178 files changed, 1049 insertions, 267 deletions
diff --git a/build-test.sh b/build-test.sh
new file mode 100755
index 0000000000..af09e255d4
--- /dev/null
+++ b/build-test.sh
@@ -0,0 +1,642 @@
+#!/usr/bin/env bash
+
+initHostDistroRid()
+{
+    if [ "$__HostOS" == "Linux" ]; then
+        if [ ! -e /etc/os-release ]; then
+            echo "WARNING: Can not determine runtime id for current distro."
+            __HostDistroRid=""
+        else
+            source /etc/os-release
+            __HostDistroRid="$ID.$VERSION_ID-$__HostArch"
+        fi
+    fi
+}
+
+initTargetDistroRid()
+{
+    if [ $__CrossBuild == 1 ]; then
+        if [ "$__BuildOS" == "Linux" ]; then
+            if [ ! -e $ROOTFS_DIR/etc/os-release ]; then
+                echo "WARNING: Can not determine runtime id for current distro."
+                export __DistroRid=""
+            else
+                source $ROOTFS_DIR/etc/os-release
+                export __DistroRid="$ID.$VERSION_ID-$__BuildArch"
+            fi
+        fi
+    else
+        export __DistroRid="$__HostDistroRid"
+    fi
+
+    # Portable builds target the base RID
+    if [ "$__PortableBuild" == 1 ]; then
+        if [ "$__BuildOS" == "Linux" ]; then
+            export __DistroRid="linux-$__BuildArch"
+        elif [ "$__BuildOS" == "OSX" ]; then
+            export __DistroRid="osx-$__BuildArch"
+        fi
+    fi
+}
+
+isMSBuildOnNETCoreSupported()
+{
+    # This needs to be updated alongwith corresponding changes to netci.groovy.
+    __isMSBuildOnNETCoreSupported=0
+
+    if [ "$__HostArch" == "x64" ]; then
+        if [ "$__HostOS" == "Linux" ]; then
+            case "$__HostDistroRid" in
+                "centos.7-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "debian.8-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "fedora.23-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "fedora.24-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "opensuse.42.1-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "rhel.7"*"-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "ubuntu.14.04-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "ubuntu.16.04-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "ubuntu.16.10-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                "alpine.3.4.3-x64")
+                    __isMSBuildOnNETCoreSupported=1
+                    ;;
+                *)
+                __isMSBuildOnNETCoreSupported=$__msbuildonunsupportedplatform
+            esac
+        elif [ "$__HostOS" == "OSX" ]; then
+            __isMSBuildOnNETCoreSupported=1
+        fi
+    fi
+}
+
+build_Tests()
+{
+    __TestDir=$__ProjectDir/tests
+    __ProjectFilesDir=$__TestDir
+    __TestBinDir=$__TestWorkingDir
+
+    if [ $__RebuildTests -ne 0 ]; then
+        if [ -d "${__TestBinDir}" ]; then
+            echo "Removing tests build dir: ${__TestBinDir}"
+            rm -rf $__TestBinDir
+        fi
+    fi
+
+    __CMakeBinDir="${__TestBinDir}"
+
+    if [ -z "$__TestIntermediateDir" ]; then
+        __TestIntermediateDir="tests/obj/${__BuildOS}.${__BuildArch}.${__BuildType}"
+    fi
+
+	echo "__BuildOS: ${__BuildOS}"
+	echo "__BuildArch: ${__BuildArch}"
+	echo "__BuildType: ${__BuildType}"
+	echo "__TestIntermediateDir: ${__TestIntermediateDir}"
+
+    if [ ! -f "$__TestBinDir" ]; then
+        echo "Creating TestBinDir: ${__TestBinDir}"
+        mkdir -p $__TestBinDir
+    fi
+    if [ ! -f "$__LogsDir" ]; then
+        echo "Creating LogsDir: ${__LogsDir}"
+        mkdir -p $__LogsDir
+    fi
+
+    __BuildProperties="-p:OSGroup=${__BuildOS} -p:BuildOS=${__BuildOS} -p:BuildArch=${__BuildArch} -p:BuildType=${__BuildType}"
+
+    # =========================================================================================
+    # ===
+    # === Restore product binaries from packages
+    # ===
+    # =========================================================================================
+
+    build_Tests_internal "Restore_Product" "${__ProjectDir}/tests/build.proj" " -BatchRestorePackages" "Restore product binaries (build tests)"
+
+    build_Tests_internal "Tests_GenerateRuntimeLayout" "${__ProjectDir}/tests/runtest.proj" "-BinPlaceRef -BinPlaceProduct -CopyCrossgenToProduct" "Restore product binaries (run tests)"
+
+    if [ -n "$__UpdateInvalidPackagesArg" ]; then
+        __up=-updateinvalidpackageversion
+    fi
+
+    # Work hardcoded path around
+    if [ ! -f "${__BuildToolsDir}/Microsoft.CSharp.Core.Targets" ]; then
+        ln -s "${__BuildToolsDir}/Microsoft.CSharp.Core.targets" "${__BuildToolsDir}/Microsoft.CSharp.Core.Targets"
+    fi
+    if [ ! -f "${__BuildToolsDir}/Microsoft.CSharp.targets" ]; then
+        ln -s "${__BuildToolsDir}/Microsoft.CSharp.Targets" "${__BuildToolsDir}/Microsoft.CSharp.targets"
+    fi
+
+    echo "Starting the Managed Tests Build..."
+
+    __ManagedTestBuiltMarker=${__TestBinDir}/managed_test_build
+
+    if [ ! -f $__ManagedTestBuiltMarker ]; then
+
+	    build_Tests_internal "Tests_Managed" "$__ProjectDir/tests/build.proj" "$__up" "Managed tests build (build tests)"
+
+        if [ $? -ne 0 ]; then
+            echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
+            exit 1
+        else
+            echo "Tests have been built."
+            echo "Create marker \"${__ManagedTestBuiltMarker}\""
+            touch $__ManagedTestBuiltMarker
+        fi
+    else
+        echo "Managed Tests had been built before."
+    fi
+
+    if [ $__BuildTestWrappers -ne -0 ]; then
+        echo "${__MsgPrefix}Creating test wrappers..."
+
+        __XUnitWrapperBuiltMarker=${__TestBinDir}/xunit_wrapper_build
+
+        if [ ! -f $__XUnitWrapperBuiltMarker ]; then
+
+            build_Tests_internal "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "-BuildWrappers -MsBuildEventLogging=\" \" " "Test Xunit Wrapper"
+
+            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
+        else
+            echo "XUnit Wrappers had been built before."
+        fi
+    fi
+
+    echo "${__MsgPrefix}Creating test overlay..."
+
+    if [ -z "$XuintTestBinBase" ]; then
+      XuintTestBinBase=$__TestWorkingDir
+    fi
+
+    export CORE_ROOT=$XuintTestBinBase/Tests/Core_Root
+
+    if [ ! -f "${CORE_ROOT}" ]; then
+      mkdir -p $CORE_ROOT
+    else
+      rm -rf $CORE_ROOT/*
+    fi
+
+    cp -r $__BinDir/* $CORE_ROOT/ > /dev/null
+
+    build_Tests_internal "Tests_Overlay_Managed" "$__ProjectDir/tests/runtest.proj" "-testOverlay" "Creating test overlay"
+
+    if [ $__ZipTests -ne 0 ]; then
+        echo "${__MsgPrefix}ZIP tests packages..."
+        build_Tests_internal "Helix_Prep" "$__ProjectDir/tests/helixprep.proj" " " "Prep test binaries for Helix publishing"
+    fi
+}
+
+build_Tests_internal()
+{
+	subDirectoryName=$1
+	projectName=$2
+	extraBuildParameters=$3
+	stepName="$4"
+
+	# Set up directories and file names
+	__BuildLogRootName=$subDirectoryName
+    __BuildLog="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.log"
+    __BuildWrn="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.wrn"
+    __BuildErr="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.err"
+    __msbuildLog="\"/flp:Verbosity=normal;LogFile=${__BuildLog}\""
+    __msbuildWrn="\"/flp1:WarningsOnly;LogFile=${__BuildWrn}\""
+    __msbuildErr="\"/flp2:ErrorsOnly;LogFile=${__BuildErr}\""
+
+    # Generate build command
+    buildCommand="$__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog=${__msbuildLog} -MsBuildWrn=${__msbuildWrn} -MsBuildErr=${__msbuildErr} $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs"
+
+    echo "Building step '$stepName' via $buildCommand"
+
+    # Invoke MSBuild
+    eval $buildCommand
+
+    # Invoke MSBuild
+    # $__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog="$__msbuildLog" -MsBuildWrn="$__msbuildWrn" -MsBuildErr="$__msbuildErr" $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs
+
+    # Make sure everything is OK
+    if [ $? -ne 0 ]; then
+        echo "${__MsgPrefix}Failed to build $stepName. See the build logs:"
+        echo "    $__BuildLog"
+        echo "    $__BuildWrn"
+        echo "    $__BuildErr"
+        exit 1
+    fi
+}
+
+usage()
+{
+    echo "Usage: $0 [BuildArch] [BuildType] [verbose] [coverage] [cross] [clangx.y] [ninja] [runtests] [bindir]"
+    echo "BuildArch can be: x64, x86, arm, armel, arm64"
+    echo "BuildType can be: debug, checked, release"
+    echo "coverage - optional argument to enable code coverage build (currently supported only for Linux and OSX)."
+    echo "ninja - target ninja instead of GNU make"
+    echo "clangx.y - optional argument to build using clang version x.y."
+    echo "cross - optional argument to signify cross compilation,"
+    echo "      - will use ROOTFS_DIR environment variable if set."
+    echo "crosscomponent - optional argument to build cross-architecture component,"
+    echo "               - will use CAC_ROOTFS_DIR environment variable if set."
+    echo "portableLinux - build for Portable Linux Distribution"
+    echo "verbose - optional argument to enable verbose build output."
+    echo "rebuild - if tests have already been built - rebuild them"
+    echo "runtests - run tests after building them"
+    echo "ziptests - zips CoreCLR tests & Core_Root for a Helix run"
+    echo "bindir - output directory (defaults to $__ProjectRoot/bin)"
+    echo "msbuildonunsupportedplatform - build managed binaries even if distro is not officially supported."
+    exit 1
+}
+
+
+# Obtain the location of the bash script to figure out where the root of the repo is.
+__ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# $__ProjectRoot/build.sh $1 $2
+
+# Use uname to determine what the CPU is.
+CPUName=$(uname -p)
+
+# Some Linux platforms report unknown for platform, but the arch for machine.
+if [ "$CPUName" == "unknown" ]; then
+    CPUName=$(uname -m)
+fi
+
+case $CPUName in
+    i686)
+        echo "Unsupported CPU $CPUName detected, build might not succeed!"
+        __BuildArch=x86
+        __HostArch=x86
+        ;;
+
+    x86_64)
+        __BuildArch=x64
+        __HostArch=x64
+        ;;
+
+    armv7l)
+        echo "Unsupported CPU $CPUName detected, build might not succeed!"
+        __BuildArch=arm
+        __HostArch=arm
+        ;;
+
+    aarch64)
+        __BuildArch=arm64
+        __HostArch=arm64
+        ;;
+
+    *)
+        echo "Unknown CPU $CPUName detected, configuring as if for x64"
+        __BuildArch=x64
+        __HostArch=x64
+        ;;
+esac
+
+# Use uname to determine what the OS is.
+OSName=$(uname -s)
+case $OSName in
+    Linux)
+        __BuildOS=Linux
+        __HostOS=Linux
+        ;;
+
+    Darwin)
+        __BuildOS=OSX
+        __HostOS=OSX
+        ;;
+
+    FreeBSD)
+        __BuildOS=FreeBSD
+        __HostOS=FreeBSD
+        ;;
+
+    OpenBSD)
+        __BuildOS=OpenBSD
+        __HostOS=OpenBSD
+        ;;
+
+    NetBSD)
+        __BuildOS=NetBSD
+        __HostOS=NetBSD
+        ;;
+
+    SunOS)
+        __BuildOS=SunOS
+        __HostOS=SunOS
+        ;;
+
+    *)
+        echo "Unsupported OS $OSName detected, configuring as if for Linux"
+        __BuildOS=Linux
+        __HostOS=Linux
+        ;;
+esac
+
+__BuildType=Debug
+__CodeCoverage=
+__IncludeTests=INCLUDE_TESTS
+
+# Set the various build properties here so that CMake and MSBuild can pick them up
+export __ProjectDir="$__ProjectRoot"
+__SourceDir="$__ProjectDir/src"
+__PackagesDir="$__ProjectDir/packages"
+__RootBinDir="$__ProjectDir/bin"
+__BuildToolsDir="$__ProjectDir/Tools"
+__UnprocessedBuildArgs=
+__RunArgs=
+__MSBCleanBuildArgs=
+__UseNinja=0
+__VerboseBuild=0
+__SkipRestore=""
+__CrossBuild=0
+__ClangMajorVersion=0
+__ClangMinorVersion=0
+__NuGetPath="$__PackagesDir/NuGet.exe"
+__HostDistroRid=""
+__DistroRid=""
+__cmakeargs=""
+__PortableLinux=0
+__msbuildonunsupportedplatform=0
+__ZipTests=0
+__NativeTestIntermediatesDir=
+__RunTests=0
+__RebuildTests=0
+__BuildTestWrappers=0
+CORE_ROOT=
+
+
+while :; do
+    if [ $# -le 0 ]; then
+        break
+    fi
+
+    lowerI="$(echo $1 | awk '{print tolower($0)}')"
+    case $lowerI in
+        -\?|-h|--help)
+            usage
+            exit 1
+            ;;
+
+        x86)
+            __BuildArch=x86
+            ;;
+
+        x64)
+            __BuildArch=x64
+            ;;
+
+        arm)
+            __BuildArch=arm
+            ;;
+
+        armel)
+            __BuildArch=armel
+            ;;
+
+        arm64)
+            __BuildArch=arm64
+            ;;
+
+        debug)
+            __BuildType=Debug
+            ;;
+
+        checked)
+            __BuildType=Checked
+            ;;
+
+        release)
+            __BuildType=Release
+            ;;
+
+        coverage)
+            __CodeCoverage=Coverage
+            ;;
+
+        cross)
+            __CrossBuild=1
+            ;;
+
+        portablelinux)
+            if [ "$__BuildOS" == "Linux" ]; then
+                __PortableLinux=1
+            else
+                echo "ERROR: portableLinux not supported for non-Linux platforms."
+                exit 1
+            fi
+            ;;
+
+        verbose)
+        __VerboseBuild=1
+        ;;
+
+        clang3.5)
+            __ClangMajorVersion=3
+            __ClangMinorVersion=5
+            ;;
+
+        clang3.6)
+            __ClangMajorVersion=3
+            __ClangMinorVersion=6
+            ;;
+
+        clang3.7)
+            __ClangMajorVersion=3
+            __ClangMinorVersion=7
+            ;;
+
+        clang3.8)
+            __ClangMajorVersion=3
+            __ClangMinorVersion=8
+            ;;
+
+        clang3.9)
+            __ClangMajorVersion=3
+            __ClangMinorVersion=9
+            ;;
+
+        ninja)
+            __UseNinja=1
+            ;;
+
+        runtests)
+            __RunTests=1
+            ;;
+
+        rebuild)
+            __RebuildTests=1
+            ;;
+
+        ziptests)
+            __ZipTests=1
+            ;;
+
+        bindir)
+            if [ -n "$2" ]; then
+                __RootBinDir="$2"
+                if [ ! -d $__RootBinDir ]; then
+                    mkdir $__RootBinDir
+                fi
+                __RootBinParent=$(dirname $__RootBinDir)
+                __RootBinName=${__RootBinDir##*/}
+                __RootBinDir="$(cd $__RootBinParent &>/dev/null && printf %s/%s $PWD $__RootBinName)"
+                shift
+            else
+                echo "ERROR: 'bindir' requires a non-empty option argument"
+                exit 1
+            fi
+            ;;
+
+        msbuildonunsupportedplatform)
+            __msbuildonunsupportedplatform=1
+            ;;
+        *)
+            __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
+            ;;
+    esac
+
+    shift
+done
+
+
+__RunArgs="-BuildArch=$__BuildArch -BuildType=$__BuildType -BuildOS=$__BuildOS"
+
+# Configure environment if we are doing a verbose build
+if [ $__VerboseBuild == 1 ]; then
+    export VERBOSE=1
+	__RunArgs="$__RunArgs -verbose"
+fi
+
+# Set default clang version
+if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then
+    if [ $__CrossBuild == 1 ]; then
+        __ClangMajorVersion=3
+        __ClangMinorVersion=6
+    else
+        __ClangMajorVersion=3
+        __ClangMinorVersion=5
+    fi
+fi
+
+
+# Set dependent variables
+__LogsDir="$__RootBinDir/Logs"
+
+# init the host distro name
+initHostDistroRid
+
+# Set the remaining variables based upon the determined build configuration
+__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
+__PackagesBinDir="$__BinDir/.nuget"
+__ToolsDir="$__RootBinDir/tools"
+__TestDir="$__ProjectDir/tests"
+__TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType"
+__IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
+__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType"
+__isMSBuildOnNETCoreSupported=0
+__CrossComponentBinDir="$__BinDir"
+__CrossCompIntermediatesDir="$__IntermediatesDir/crossgen"
+
+__CrossArch="$__HostArch"
+if [[ "$__HostArch" == "x64" && "$__BuildArch" == "arm" ]]; then
+    __CrossArch="x86"
+fi
+if [ $__CrossBuild == 1 ]; then
+    __CrossComponentBinDir="$__CrossComponentBinDir/$__CrossArch"
+fi
+__CrossgenCoreLibLog="$__LogsDir/CrossgenCoreLib_$__BuildOS.$BuildArch.$__BuildType.log"
+__CrossgenExe="$__CrossComponentBinDir/crossgen"
+
+isMSBuildOnNETCoreSupported
+
+# CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set.
+# This is needed by CLI to function.
+if [ -z "$HOME" ]; then
+    if [ ! -d "$__ProjectDir/temp_home" ]; then
+        mkdir temp_home
+    fi
+    export HOME=$__ProjectDir/temp_home
+    echo "HOME not defined; setting it to $HOME"
+fi
+
+# Specify path to be set for CMAKE_INSTALL_PREFIX.
+# This is where all built CoreClr libraries will copied to.
+export __CMakeBinDir="$__BinDir"
+
+if [ ! -d "$__BinDir" ] || [ ! -d "$__BinDir/bin" ]; then
+
+    echo "Has not been found built CoreCLR instance"
+    echo "Please build it before tests using './build.sh $__BuildArch $__BuildType'"
+    exit 1
+fi
+
+# Configure environment if we are doing a cross compile.
+if [ $__CrossBuild == 1 ]; then
+    export CROSSCOMPILE=1
+    if ! [[ -n "$ROOTFS_DIR" ]]; then
+        export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch"
+    fi
+fi
+
+# init the target distro name
+initTargetDistroRid
+
+# Override tool directory
+
+__CoreClrVersion=1.1.0
+__sharedFxDir=$__BuildToolsDir/dotnetcli/shared/Microsoft.NETCore.App/$__CoreClrVersion/
+
+echo "Building Tests..."
+
+build_Tests
+
+if [ $? -ne 0 ]; then
+    echo "Failed to build tests"
+    exit 1
+fi
+
+echo "${__MsgPrefix}Test build successful."
+echo "${__MsgPrefix}Test binaries are available at ${__TestBinDir}"
+
+__testNativeBinDir=$__IntermediatesDir/tests
+
+if [ $__RunTests -ne 0 ]; then
+
+    echo "Run Tests..."
+
+    echo "${__TestDir}/runtest.sh --testRootDir=$__TestBinDir --coreClrBinDir=$__BinDir --coreFxBinDir=$__sharedFxDir --testNativeBinDir=$__testNativeBinDir"
+
+    $__TestDir/runtest.sh --testRootDir=$__TestBinDir --coreClrBinDir=$__BinDir --coreFxBinDir=$CORE_ROOT --testNativeBinDir=$__testNativeBinDir
+
+    echo "Tests run successful."
+else
+    echo "To run all tests use 'tests/runtests.sh' where:"
+    echo "    testRootDir      = $__TestBinDir"
+    echo "    coreClrBinDir    = $__BinDir"
+    echo "    coreFxBinDir     = $CORE_ROOT"
+    echo "    testNativeBinDir = $__testNativeBinDir"
+    echo " -------------------------------------------------- "
+    echo "To run single test use the following command:"
+    echo "    bash ${__TestBinDir}/__TEST_PATH__/__TEST_NAME__.sh -coreroot=${CORE_ROOT}"
+fi
+
diff --git a/dir.props b/dir.props
index 0ceb7fec13..65f3074e61 100644
--- a/dir.props
+++ b/dir.props
@@ -26,7 +26,11 @@
      as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks.
      -->
   <PropertyGroup>
-    <BuildToolsTargets45>true</BuildToolsTargets45>
+    <RunningOnCore>false</RunningOnCore>
+    <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore>
+    <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop>
+    <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop>
+    <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45>
   </PropertyGroup>
 
   <!-- Common properties -->
@@ -68,8 +72,8 @@
     <PackagesBinDir>$(__PackagesBinDir)</PackagesBinDir>
     <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir>
 
-    <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir>
-    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
+    <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools\</ToolsDir>
+    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli\</DotnetCliPath>
     <OverrideToolHost>$(DotnetCliPath)dotnet</OverrideToolHost>
     <BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore>
 
diff --git a/init-tools.sh b/init-tools.sh
index b676ba1846..c076212ab5 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -16,7 +16,8 @@ __INIT_TOOLS_DONE_MARKER=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/done
 
 if [ -z "$__DOTNET_PKG" ]; then
     if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then
-        echo "Warning: build not supported on 32 bit Unix"
+        echo "Error: build not supported on 32 bit Unix"
+        exit 1
     fi
 OSName=$(uname -s)
     case $OSName in
diff --git a/tests/build.proj b/tests/build.proj
index 066f2a2370..584ac58acf 100644
--- a/tests/build.proj
+++ b/tests/build.proj
@@ -35,6 +35,7 @@
 
   <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages">
     <Message Text="Building Targeting Pack" Importance="High" />
+    <Error  Text="BuildOS has not been specified. Please do that then run build again."  Condition="'$(BuildOS)' == 'AnyOS'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" />
   </Target>
 
diff --git a/tests/dir.props b/tests/dir.props
index e98b3036eb..f44d73a19d 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -4,6 +4,7 @@
     $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
   -->
   <PropertyGroup>
+    <OsEnvironment Condition="'$(OsEnvironment)'=='' and '$(OS)'=='OSX'">Unix</OsEnvironment>
     <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment>
   </PropertyGroup>
   
@@ -18,7 +19,12 @@
     as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.6 version of the tasks.   
    -->   
   <PropertyGroup>  
-    <BuildToolsTargets45>true</BuildToolsTargets45>   
+    <RunningOnCore>false</RunningOnCore>
+    <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore>
+    <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop>
+    <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop>
+    <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45>
+    <RunningOnUnix Condition="('$(RunningOnUnix)' == '') And ('$(MSBuildRuntimeType)' == 'Core')">true</RunningOnUnix>
   </PropertyGroup>  
 
   <!-- Common repo directories -->
@@ -28,8 +34,15 @@
     <SourceDir>$(ProjectDir)src\</SourceDir>
     <PackagesDir>$(ProjectDir)..\packages\</PackagesDir>
     <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir>
-    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
-    <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir>
+    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli\</DotnetCliPath>
+    <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46\</BuildToolsTaskDir>
+    <OverrideToolHost Condition="'$(OS)' != 'Windows_NT'">$(DotnetCliPath)dotnet</OverrideToolHost>
+    <CSharpCoreTargetsPath Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(ToolsDir)\Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath>
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
+         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
+    <_TargetFrameworkDirectories Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
+    <ExcludeSigningImport>true</ExcludeSigningImport>
     <SkipImportILTargets>true</SkipImportILTargets>
   </PropertyGroup>
 
@@ -37,6 +50,11 @@
   <PropertyGroup>
     <RootBinDir>$(__RootBinDir)\</RootBinDir>
     <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\bin\</RootBinDir>
+
+    <BinDir>$(__BinDir)\</BinDir>
+    <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
+
+    <CoreCLRBinDir>$(RootBinDir)Product\$(__BuildOS).$(__BuildArch).$(__BuildType)\</CoreCLRBinDir>
   </PropertyGroup>
 
 <!-- Default Test platform to deploy the netstandard compiled tests to -->
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 2a797bc81a..18b3304fa9 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -78,12 +78,12 @@ $(_XunitEpilog)
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <TargetFrameworkIdentifier Condition ="'$(BuildTestsAgainstPackages)' != 'true'">.NETFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion Condition ="'$(BuildTestsAgainstPackages)' != 'true'">v4.5</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier Condition ="('$(BuildTestsAgainstPackages)' != 'true') And ('$(BuildOS)' == 'Windows_NT')">.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion Condition ="('$(BuildTestsAgainstPackages)' != 'true') And ('$(BuildOS)' == 'Windows_NT')">v4.5</TargetFrameworkVersion>
     <NugetTargetMonikerShort Condition ="'$(BuildTestsAgainstPackages)' != 'true'">net45</NugetTargetMonikerShort>
     <IsXunitWrapperProject>true</IsXunitWrapperProject>
     <SkipSigning>true</SkipSigning>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB}%3B{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <IsTestProject>true</IsTestProject>
@@ -100,11 +100,11 @@ $(_XunitEpilog)
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
    <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' != 'true'">
+    <ProjectReference Include="$(SourceDir)Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="('$(BuildTestsAgainstPackages)' != 'true') And ('$(BuildOS)' == 'Windows_NT')">
       <Project>{8ffe99c0-22f8-4462-b839-970eac1b3472}</Project>
       <Name>coreclr</Name>
     </ProjectReference>
-    <ProjectReference Include="$(SourceDir)Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'">
+    <ProjectReference Include="$(SourceDir)Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="('$(BuildTestsAgainstPackages)' == 'true') Or ('$(BuildOS)' != 'Windows_NT')">
       <Project>{8ffe99c0-22f8-4462-b839-970eac1b3472}</Project>
       <Name>coreclr</Name>
     </ProjectReference>
@@ -152,8 +152,10 @@ $(_XunitEpilog)
     <PropertyGroup>
       <_CMDDIR_Parent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR)))</_CMDDIR_Parent>
       <_CMDDIR_Grandparent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR_Parent)))</_CMDDIR_Grandparent>
-      <CategoryWithSlash>$([System.String]::Copy('$(_CMDDIR)').Replace($(_CMDDIR_Grandparent)\,''))</CategoryWithSlash>
-      <Category>$([System.String]::Copy('$(CategoryWithSlash)').Replace('\','.'))</Category>
+      <CategoryWithSlash Condition="'$(RunningOnUnix)' != 'true'" >$([System.String]::Copy('$(_CMDDIR)').Replace("$(_CMDDIR_Grandparent)\",""))</CategoryWithSlash>
+      <CategoryWithSlash Condition="'$(RunningOnUnix)' == 'true'" >$([System.String]::Copy('$(_CMDDIR)').Replace("$(_CMDDIR_Grandparent)/",""))</CategoryWithSlash>
+      <Category Condition="'$(RunningOnUnix)' != 'true'" >$([System.String]::Copy('$(CategoryWithSlash)').Replace('\','.'))</Category>
+      <Category Condition="'$(RunningOnUnix)' == 'true'" >$([System.String]::Copy('$(CategoryWithSlash)').Replace('/','.'))</Category>
       <XunitWrapper>$(Category).XUnitWrapper</XunitWrapper>
       <XunitWrapperSrcDir>$(XunitWrapperGeneratedCSDirBase)$(Category)</XunitWrapperSrcDir>
       <XunitWrapperOutputDir>$(XunitWrapperOutputIntermediatedDirBase)$(Category)</XunitWrapperOutputDir>
@@ -220,13 +222,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
     </PropertyGroup>
 
     <ItemGroup>
-      <AllCMDsPresent Include="$(_CMDDIR)\**\*.cmd" />
+      <AllCMDsPresent Include="$(_CMDDIR)\**\*.cmd" Condition="'$(RunningOnUnix)' != 'true'" />
+      <AllCMDsPresent Include="$(_CMDDIR)\**\*.sh" Condition="'$(RunningOnUnix)' == 'true'" />
       <AllCMDExcludeFilter Include="@(CanonicalExcludeList)" Condition="$(HaveExcludes)"/>
       <AllCMDs Include="@(AllCMDsPresent)" Exclude="@(AllCMDExcludeFilter)"/>
 
       <AllCommands Include="@(AllCMDs)" >
-        <_FactName>$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_").Replace("\","_").Replace("-","_"))</_FactName>
-        <_ClassName>$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace("cmd","").Replace(".","_").Replace("\","_").Replace("-","_"))</_ClassName>
+        <_FactName Condition="'$(RunningOnUnix)' != 'true'" >$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_").Replace("\","_").Replace("-","_"))</_FactName>
+        <_ClassName Condition="'$(RunningOnUnix)' != 'true'" >$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace("cmd","").Replace(".","_").Replace("\","_").Replace("-","_"))</_ClassName>
+        <_FactName Condition="'$(RunningOnUnix)' == 'true'" >$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_").Replace("/","_").Replace("-","_"))</_FactName>
+        <_ClassName Condition="'$(RunningOnUnix)' == 'true'" >$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace("sh","").Replace(".","_").Replace("/","_").Replace("-","_"))</_ClassName>
 
         <_XunitFact >
           <![CDATA[
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets
index f95408f512..a5727414b0 100644
--- a/tests/src/CLRTest.Execute.Bash.targets
+++ b/tests/src/CLRTest.Execute.Bash.targets
@@ -83,7 +83,7 @@ fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[
 $(BashCLRTestEnvironmentCompatibilityCheck)
-if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) -o \( ! -z "$COMPlus_TailcallStress" \) ]
+if [[ ( ! -z "$COMPlus_JitStress" ) || ( ! -z "$COMPlus_JitStressRegs" ) || ( ! -z "$COMPlus_JITMinOpts" ) || ( ! -z "$COMPlus_TailcallStress" ) ]]
 then
   echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET"
   exit $(GCBashScriptExitCode)
@@ -133,7 +133,7 @@ fi
         <Command><![CDATA[        export _DebuggerFullPath="${i#*=}"
         if [ ! -f "$_DebuggerFullPath" ]
         then
-            echo The Debugger FullPath \"$_DebuggerFullPath\" doesn\'t exist
+            echo "The Debugger FullPath %5C%22${_DebuggerFullPath}%5C%22 does not exist"
             usage
         fi]]></Command>
         <Description>Run testcases under debugger.</Description>
@@ -290,10 +290,6 @@ CLRTestExpectedExitCode=0
     <!-- Raise an error if any value in _RequiredProperties is missing  -->
     <Error Condition=" '%(_RequiredProperties.Value)'=='' "
       Text="Missing required test property [%(_RequiredProperties.Identity)]. Something isn't plumbed through correctly.  Contact $(_CLRTestBuildSystemOwner)." />
-      <!-- TODO: this is weird.  Consider eliminating it. -->
-    <GenerateParamList ArgumentItems="@(BashCLRTestExecutionScriptArgument)">
-      <Output TaskParameter="ParamList" PropertyName="_CLRTestParamList"/>
-    </GenerateParamList>
     <PropertyGroup>
       <!--
       This generates the script portion to parse all of the command line arguments.
diff --git a/tests/src/CLRTest.Execute.targets b/tests/src/CLRTest.Execute.targets
index b49785b9d6..50860ea529 100644
--- a/tests/src/CLRTest.Execute.targets
+++ b/tests/src/CLRTest.Execute.targets
@@ -96,7 +96,7 @@ This file contains the logic for providing Execution Script generation.
   -->
   
   <ItemGroup>
-    <ExecutionScriptKind Include="Batch" />
+    <ExecutionScriptKind Include="Batch" Condition="'$(BuildOS)' == 'Windows_NT'"/>
     <ExecutionScriptKind Include="Bash" />
   </ItemGroup>
 
diff --git a/tests/src/CLRTest.Jit.targets b/tests/src/CLRTest.Jit.targets
index 1dd872c4af..b1bdeef21e 100644
--- a/tests/src/CLRTest.Jit.targets
+++ b/tests/src/CLRTest.Jit.targets
@@ -23,9 +23,11 @@ WARNING:   When setting properties based on their current state (for example:
   <Target Name="GetJitDisasmBashScript"
           Returns="$(JitDisasmBashScript)">
     <PropertyGroup>
-      <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName>
+      <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' == 'true')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName>
+      <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName>
       <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName>
-      <JitDisasmOut>$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)).Replace("\","/"))</JitDisasmOut>
+      <JitDisasmOut Condition="'$(RunningOnUnix)' == 'true'">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/"))</JitDisasmOut>
+      <JitDisasmOut Condition="'$(RunningOnUnix)' != 'true'">$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut>
       <JitDisasmBashScript>
 <![CDATA[
 # JitDisasm Script
@@ -48,9 +50,11 @@ fi
   <Target Name="GetJitDisasmBatchScript"
           Returns="$(JitDisasmBatchScript)">
     <PropertyGroup>
-      <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName>
+      <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' == 'true')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName>
+      <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName>
       <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName>
-      <JitDisasmOut>$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut>
+      <JitDisasmOut Condition="'$(RunningOnUnix)' == 'true'">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/"))</JitDisasmOut>
+      <JitDisasmOut Condition="'$(RunningOnUnix)' != 'true'">$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut>
       <JitDisasmBatchScript>
 <![CDATA[
 REM JitDisasm Script
@@ -72,7 +76,8 @@ if defined RunningJitDisasm (
       Name="GetIlasmRoundTripBashScript"
       Returns="$(IlasmRoundTripBashScript)">
     <PropertyGroup>
-      <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName>
+      <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' == 'true')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName>
+      <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(RunningOnUnix)' != 'true')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName>
       <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName>
       <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName>
       <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName>
diff --git a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj
index e982e5f414..49e4f023da 100644
--- a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="MemCheck.cs" />
+    <Compile Include="memcheck.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj
index e982e5f414..49e4f023da 100644
--- a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj
+++ b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="MemCheck.cs" />
+    <Compile Include="memcheck.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/IL.targets b/tests/src/IL.targets
index 36cff53035..d1075e53f7 100644
--- a/tests/src/IL.targets
+++ b/tests/src/IL.targets
@@ -11,8 +11,12 @@
           Returns=""
           DependsOnTargets="$(CoreCompileDependsOn)">
     <PropertyGroup>
-      <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">/DLL</_OutputTypeArgument>
-      <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">/EXE</_OutputTypeArgument>
+      <_ShellKeyMarker Condition="'$(RunningOnUnix)' == 'true'">-</_ShellKeyMarker>  <!-- Work around ilasm comandline parser bugs... -->
+      <_ShellKeyMarker Condition="'$(RunningOnUnix)' != 'true'">/</_ShellKeyMarker>
+      <_ilasm>ilasm</_ilasm>
+      <_ilasm Condition="'$(RunningOnUnix)' == 'true'">$(CoreCLRBinDir)ilasm</_ilasm>
+      <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">$(_ShellKeyMarker)DLL</_OutputTypeArgument>
+      <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">$(_ShellKeyMarker)EXE</_OutputTypeArgument>
       <_IlasmSwitches>-QUIET -NOLOGO</_IlasmSwitches>
       <_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) -FOLD</_IlasmSwitches>
       <_IlasmSwitches Condition="'$(SizeOfStackReserve)' != ''">$(_IlasmSwitches) -STACK=$(SizeOfStackReserve)</_IlasmSwitches>
@@ -22,7 +26,7 @@
       <_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE</_IlasmSwitches>
     </PropertyGroup>
 
-    <Exec Command="ilasm $(_OutputTypeArgument) /OUTPUT=@(IntermediateAssembly) $(_IlasmSwitches) @(Compile)">
+    <Exec Command="$(_ilasm) $(_OutputTypeArgument) $(_ShellKeyMarker)OUTPUT=@(IntermediateAssembly) $(_IlasmSwitches) @(Compile)">
       <Output TaskParameter="ExitCode" PropertyName="_ILAsmExitCode" />
     </Exec>
     <Error Text="ILAsm failed" Condition="'$(_ILAsmExitCode)' != '0'" />
diff --git a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
index 9fe1293674..144cfcee28 100644
--- a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <PropertyGroup></PropertyGroup>
   <ItemGroup>
-    <Compile Include="Simple.il" />
+    <Compile Include="simple.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
index ea51f6e203..59f063e83f 100644
--- a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
+++ b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <PropertyGroup></PropertyGroup>
   <ItemGroup>
-    <Compile Include="TailWinApi.il" />
+    <Compile Include="tailwinapi.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
index 7b74c279a9..62ffb83c94 100644
--- a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
+++ b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
@@ -27,7 +27,7 @@
     <JitOptimizationSensitive>true</JitOptimizationSensitive>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="JitTailcall2.il" />
+    <Compile Include="Jittailcall2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
index 6e3f86137c..793183d2dd 100644
--- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
+++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <PropertyGroup></PropertyGroup>
   <ItemGroup>
-    <Compile Include="zeroInit01_large.il" />
+    <Compile Include="zeroinit01_large.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
index a009a89710..6bcb7a0da7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <PropertyGroup></PropertyGroup>
   <ItemGroup>
-    <Compile Include="B04345.il" />
+    <Compile Include="b04345.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
index fc95236ff6..7cff691baf 100644
--- a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <PropertyGroup></PropertyGroup>
   <ItemGroup>
-    <Compile Include="zeroInit01_small.il" />
+    <Compile Include="zeroinit01_small.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
index f9763e802e..eb84b22a16 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="genericexceptions.cs" />
+    <Compile Include="GenericExceptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj
index 640d16f054..4a97b270fd 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj
@@ -27,7 +27,7 @@
     
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="filter.il" />
+    <Compile Include="Filter.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
index 0d55019255..c17e75d0b9 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="exceptions.cs" />
+    <Compile Include="Exceptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj b/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
index 6687bdd456..5dd95f3313 100644
--- a/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
+++ b/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="baadbaad.cs" />
+    <Compile Include="Baadbaad.cs" />
     <Compile Include="trace.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj b/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj
index dbbef722b0..4b0dc7e287 100644
--- a/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="InterlockedAddIntWithSubtract.cs" />
+    <Compile Include="interlockedaddintwithsubtract.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj
index 4f96c483b0..4d67ec5f51 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="IntDecCheckReturn.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="intdeccheckreturn.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj
index 0d4d53a5f5..792f7c241c 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="IntIncCheckReturn.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="intinccheckreturn.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj
index 9c9d5ca43c..f5375b48ef 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="LongDecCheckReturn.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="longdeccheckreturn.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj
index 6bdb10a13d..ad22b6ef43 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="LongIncCheckReturn.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="longinccheckreturn.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
index 89108e462a..cf07acd4d5 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchange1_cti.cs" />
+    <Compile Include="compareexchange1_cti.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
index 9188889658..ebc9c4b6b7 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchange2.cs" />
+    <Compile Include="compareexchange2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
index 9ddd16fbde..fe4d76872c 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchange3.cs" />
+    <Compile Include="compareexchange3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
index 2c0af62b07..613805b3ed 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchange4.cs" />
+    <Compile Include="compareexchange4.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
index 06ac8a939d..bfc0d14e38 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchange5_cti.cs" />
+    <Compile Include="compareexchange5_cti.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj
index d6d462cf35..473aaedac1 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchangeDouble.cs" />
+    <Compile Include="compareexchangedouble.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj
index b425023d3a..b897669aa5 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="CompareExchangeFloat.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="compareexchangefloat.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj
index 5c0b7d9e13..3635623926 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="CompareExchangeInt.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="compareexchangeint.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj
index e6782ceeb6..4ed9ffe8c6 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="CompareExchangeIntPtr.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="compareexchangeintptr.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj
index a52e8ad43f..98eef15487 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="CompareExchangeObject.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="compareexchangeobject.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj
index 5676feb5f1..37a41e58cf 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CompareExchangeT.cs" />
+    <Compile Include="compareexchanget.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj b/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj
index d41bb0677a..02a4e23f82 100644
--- a/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj
+++ b/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CtorChk.cs" />
+    <Compile Include="ctorchk.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj b/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj
index b0ffeb4cc2..0a598fc726 100644
--- a/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj
+++ b/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="IntDec.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="intdec.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj b/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj
index 1f0668498f..5826d2c6e9 100644
--- a/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj
+++ b/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="LongDec.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="longdec.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
index 7cbcfb58f8..4d72718e2c 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Exchange1_cti.cs" />
+    <Compile Include="exchange1_cti.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
index eaeed3df4d..e0eb73415e 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Exchange2.cs" />
+    <Compile Include="exchange2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
index 099a06c958..548d3f57d5 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Exchange3.cs" />
+    <Compile Include="exchange3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
index 3fa98ee972..b09e761452 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Exchange4.cs" />
+    <Compile Include="exchange4.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
index daa493b6af..2bfeac6225 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Exchange4_cti.cs" />
+    <Compile Include="exchange4_cti.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
index 1df482b524..ca831e0c71 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Exchange5_cti.cs" />
+    <Compile Include="exchange5_cti.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj
index a0c93af398..0d08660d90 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ExchangeDouble.cs" />
+    <Compile Include="exchangedouble.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj
index aa836cf5a7..aa3be561b7 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ExchangeFloat.cs" />
+    <Compile Include="exchangefloat.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj
index cf4b608d8c..6a8a3ce028 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ExchangeObject.cs" />
+    <Compile Include="exchangeobject.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj
index 75ab3764b9..8ee1ccdd06 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ExchangeT.cs" />
+    <Compile Include="exchanget.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/increment/intinc.csproj b/tests/src/baseservices/threading/interlocked/increment/intinc.csproj
index f14bc4379f..ad0bc637d1 100644
--- a/tests/src/baseservices/threading/interlocked/increment/intinc.csproj
+++ b/tests/src/baseservices/threading/interlocked/increment/intinc.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="IntInc.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="intinc.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/increment/longinc.csproj b/tests/src/baseservices/threading/interlocked/increment/longinc.csproj
index 147c3fe0bd..da59bacaf5 100644
--- a/tests/src/baseservices/threading/interlocked/increment/longinc.csproj
+++ b/tests/src/baseservices/threading/interlocked/increment/longinc.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="..\common\InterlockedHelper_CoreCLR.cs" />
-    <Compile Include="LongInc.cs" />
+    <Compile Include="..\common\interlockedhelper_coreclr.cs" />
+    <Compile Include="longinc.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj b/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj
index 86432b1b21..6a9ba4d3e3 100644
--- a/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj
+++ b/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="InterlockedRead.cs" />
+    <Compile Include="interlockedread.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/interlocked/read/readthreads.csproj b/tests/src/baseservices/threading/interlocked/read/readthreads.csproj
index 203425b05c..a8dd83af19 100644
--- a/tests/src/baseservices/threading/interlocked/read/readthreads.csproj
+++ b/tests/src/baseservices/threading/interlocked/read/readthreads.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ReadThreads.cs" />
+    <Compile Include="readthreads.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj b/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj
index d41bb0677a..02a4e23f82 100644
--- a/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj
+++ b/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CtorChk.cs" />
+    <Compile Include="ctorchk.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj b/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj
index 294df9d6d6..980fb32f5c 100644
--- a/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj
+++ b/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="MonitorEnter.cs" />
+    <Compile Include="monitorenter.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj b/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj
index 80885a0f0b..41fa74714c 100644
--- a/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj
+++ b/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="MonitorIsEntered.cs" />
+    <Compile Include="monitorisentered.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj b/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj
index bd4e134b25..5d02ac0550 100644
--- a/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj
+++ b/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="LongTimeOut.cs" />
+    <Compile Include="longtimeout.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/monitor/wait/waitnull.csproj b/tests/src/baseservices/threading/monitor/wait/waitnull.csproj
index fb17d99209..c57ccd8b5e 100644
--- a/tests/src/baseservices/threading/monitor/wait/waitnull.csproj
+++ b/tests/src/baseservices/threading/monitor/wait/waitnull.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitNull.cs" />
+    <Compile Include="waitnull.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj
index c504a01bd7..305c6b2cfa 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM01WaitAllNeg.cs" />
+    <Compile Include="am01waitallneg.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj
index be4a01b294..2732314edb 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM02WaitOneNeg.cs" />
+    <Compile Include="am02waitoneneg.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
index 1f92833f27..c2ddb9c6cf 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM04WaitAny.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="am04waitany.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
index 00a050f120..0455a88fe8 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM05WaitAnyMutex.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="am05waitanymutex.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
index e6f9e5a7c3..7de4bb2c4e 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM06AbandonAll.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="am06abandonall.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
index 8f588e9237..e7b5a577b9 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM07AbandonMultipleMutex.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="am07abandonmultiplemutex.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
index 13f46bd263..46f140fa34 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="AM08MixedArray.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="am08mixedarray.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj b/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
index 4fb5e1652a..f87e0252a4 100644
--- a/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="MutexCtor1.cs" />
+    <Compile Include="mutexctor1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj b/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
index 1e9d488082..66c9347309 100644
--- a/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="MutexCtor2.cs" />
+    <Compile Include="mutexctor2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/misc/waitone1.csproj b/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
index 20f9991a77..3a03da27f2 100644
--- a/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOne1.cs" />
+    <Compile Include="waitone1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/misc/waitone2.csproj b/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
index 7b2857fb13..f0fb07922b 100644
--- a/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOne2.cs" />
+    <Compile Include="waitone2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
index 9f8039f332..37a09059d7 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg1.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexneg1.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
index c338e1dea1..e7a6eba461 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg2.cs" />
+    <Compile Include="openmutexneg2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
index 2f4ecca33c..e5136f995d 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg3.cs" />
+    <Compile Include="openmutexneg3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
index d7251ddbc9..3c718facea 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg4.cs" />
+    <Compile Include="openmutexneg4.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
index f2a850f087..21a481cced 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg5.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexneg5.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
index 7da002409a..91d4792eb9 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg6.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexneg6.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
index c5046f02f6..042084ab86 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg7.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexneg7.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
index b7a618e4eb..02906017e3 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexNeg8.cs" />
+    <Compile Include="openmutexneg8.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
index f52ba70111..2fd73f9aed 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexPos1.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexpos1.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
index bdf45dc175..a432e1f8b3 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexPos2.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexpos2.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
index 393de48254..c0a6aeb97e 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexPos3.cs" />
-    <Compile Include="..\OpenMutexCommon.cs" />
+    <Compile Include="openmutexpos3.cs" />
+    <Compile Include="..\openmutexcommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
index 7c05073295..f219be1282 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="OpenMutexPos4.cs" />
+    <Compile Include="openmutexpos4.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj b/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj
index 9e70a3dd8c..02e7d6c679 100644
--- a/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ThreadStartArray.cs" />
+    <Compile Include="threadstartarray.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj b/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj
index 4b46e892fd..c81f2c41b6 100644
--- a/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ThreadStartClass.cs" />
+    <Compile Include="threadstartclass.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj b/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj
index 0476419c2c..e6826b16d6 100644
--- a/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ThreadStartStruct.cs" />
+    <Compile Include="threadstartstruct.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj b/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj
index 5b2b617854..43a466cb83 100644
--- a/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj
+++ b/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="ObjMonHelper.cs" />
+    <Compile Include="objmonhelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj
index 83bde86ba5..6fd83d9053 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtor1.cs" />
+    <Compile Include="semaphorector1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
index 36f444d2e9..3301e9e6f8 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtor2.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphorector2.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
index 79948025b8..061528bc54 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtor3.cs" />
+    <Compile Include="semaphorector3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
index e1b25f7afc..7273b602dc 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtor4.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphorector4.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
index d5532dfb90..4ceecac734 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtor5.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphorector5.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj
index 2043cd12f8..49b47681c9 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtorNeg1.cs" />
+    <Compile Include="semaphorectorneg1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj
index 6d430ec403..1710153ff2 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtorNeg2.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphorectorneg2.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj
index 4448137f41..7f8c05cfc5 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreCtorNeg3.cs" />
+    <Compile Include="semaphorectorneg3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
index a5ab0dbc80..2384490b58 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg1.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphoreopenneg1.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
index 0426a70d40..db61bfc0bd 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg2.cs" />
+    <Compile Include="semaphoreopenneg2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
index 6207a9eb6b..7ad6cd105a 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg3.cs" />
+    <Compile Include="semaphoreopenneg3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
index 6fc5173543..d69032eb72 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg4.cs" />
+    <Compile Include="semaphoreopenneg4.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
index 23662b2341..15b1ff59cb 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg5.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphoreopenneg5.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
index b24256272a..817aca2ae0 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg6.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphoreopenneg6.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
index 7389c39421..2155e221a2 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemaphoreOpenNeg7.cs" />
-    <Compile Include="..\SemaphoreCommon.cs" />
+    <Compile Include="semaphoreopenneg7.cs" />
+    <Compile Include="..\semaphorecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj b/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj
index 5d40bbe81e..cfc83f9156 100644
--- a/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj
+++ b/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemDemo.cs" />
+    <Compile Include="semdemo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/semaphore/unit/semtest.csproj b/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
index 4e68878e65..48ce59c2a4 100644
--- a/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
+++ b/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="SemTest.cs" />
+    <Compile Include="semtest.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
index 6eb7fc0807..cafede0e80 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandle1.cs" />
+    <Compile Include="bindhandle1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
index 35a6daead8..4936eb1c91 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandleInvalid.cs" />
+    <Compile Include="bindhandleinvalid.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
index 85eca9b7c4..40a45e3562 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandleInvalid3.cs" />
+    <Compile Include="bindhandleinvalid3.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
index ef626e4c5f..b4680468a9 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandleInvalid4.cs" />
+    <Compile Include="bindhandleinvalid4.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
index 2d621c8d09..f612e480db 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandleInvalid5.cs" />
+    <Compile Include="bindhandleinvalid5.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
index f72930c9cd..3bd9e99769 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandleInvalid6.cs" />
+    <Compile Include="bindhandleinvalid6.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
index 561be189b1..4cf5c959c1 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="BindHandleNull.cs" />
+    <Compile Include="bindhandlenull.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj b/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj
index d41bb0677a..02a4e23f82 100644
--- a/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj
+++ b/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="CtorChk.cs" />
+    <Compile Include="ctorchk.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj b/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj
index 11b6b3e5f7..a1830b28b7 100644
--- a/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj
+++ b/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Regression_749068.cs" />
+    <Compile Include="regression_749068.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj b/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj
index c568d0381a..2cb3338d98 100644
--- a/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj
+++ b/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Unregister01.cs" />
+    <Compile Include="unregister01.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj b/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj
index 59397bd60e..adc805abd9 100644
--- a/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj
+++ b/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="Unregister03.cs" />
+    <Compile Include="unregister03.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj b/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
index 77b2dff0da..ab3839593c 100644
--- a/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
+++ b/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitHandleDispose2.cs" />
+    <Compile Include="waithandledispose2.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj b/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
index 9198647bbf..2d5f7de095 100644
--- a/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
+++ b/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitHandleWaitOne1.cs" />
+    <Compile Include="waithandlewaitone1.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj b/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj
index 75f80ec3fa..6d90a209ea 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="NullArrayMember.cs" />
+    <Compile Include="nullarraymember.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj
index 0ca13b737c..d88669755c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="EmptyArray.cs" />
+    <Compile Include="emptyarray.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
index e22b994990..e07e5a258c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx1.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex1.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
index f58454a94f..f6792782c3 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx10.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex10.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj
index c66ec014e9..1bdf249bf2 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx10a.cs" />
+    <Compile Include="waitallex10a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
index b8e509f965..8e16927f4c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx11.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex11.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj
index ec2a2a9dfc..b4148fc134 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx11a.cs" />
+    <Compile Include="waitallex11a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj
index 6ab908bf93..ddeb93614a 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx1a.cs" />
+    <Compile Include="waitallex1a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
index 49071a51d9..ec20162700 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx2.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex2.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj
index 6d9a87f33a..a4bcca690c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx2a.cs" />
+    <Compile Include="waitallex2a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
index b00c2c673f..f349a21e2c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx3.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex3.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj
index 17f18a2b6f..bab948d0d9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx3a.cs" />
+    <Compile Include="waitallex3a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
index bb4d688918..b9f38688ed 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx4.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex4.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj
index 08e90b7c5c..f1c250eaff 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx4a.cs" />
+    <Compile Include="waitallex4a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
index a29ac4b622..4755860930 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx5.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex5.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj
index 9f26f9d4a9..0335cc7700 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx5a.cs" />
+    <Compile Include="waitallex5a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
index 45c5b4e81d..eb60a22a9d 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx6.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex6.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj
index 23d7509b95..ec0e3050f7 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx6a.cs" />
+    <Compile Include="waitallex6a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
index 366e8851e8..70cd75e984 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx7.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex7.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj
index 9e1c58b02d..e1d55f413d 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx7a.cs" />
+    <Compile Include="waitallex7a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
index c1146d521e..0a2329ab4f 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx8.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex8.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
index ea55f9a83b..d433e4d7f1 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx8a.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex8a.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
index d6da8b99ef..4d704a0096 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx9.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitallex9.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj
index c5884cfca3..16685fefed 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAllEx9a.cs" />
+    <Compile Include="waitallex9a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj
index 649bea0a47..e3a5de9eb2 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="NullArray.cs" />
+    <Compile Include="nullarray.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj b/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj
index 75f80ec3fa..6d90a209ea 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="NullArrayMember.cs" />
+    <Compile Include="nullarraymember.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj
index 0ca13b737c..d88669755c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="EmptyArray.cs" />
+    <Compile Include="emptyarray.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
index 7a4702d43c..95748a570c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx1.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex1.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
index 47b297eeba..e223849ff4 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx10.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex10.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj
index 10ea28993e..a3a139a02e 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx10a.cs" />
+    <Compile Include="waitanyex10a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj
index 9c5a81f8a9..3b2f75911a 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx1a.cs" />
+    <Compile Include="waitanyex1a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
index 482dc1afd1..00d6b1f86c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx2.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex2.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj
index 44e6b99d00..bdd594fa71 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx2a.cs" />
+    <Compile Include="waitanyex2a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
index c5cba8dd40..b00ea8c0cb 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx3.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex3.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj
index 53120026b2..d99c135b6a 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx3a.cs" />
+    <Compile Include="waitanyex3a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
index a041969c13..e2ff2e100c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx4.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex4.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj
index be4fdb4416..591a20e33a 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx4a.cs" />
+    <Compile Include="waitanyex4a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
index 7eb4511eb0..e258251897 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx5.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex5.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj
index fa8a8e8c8c..12cec09e4b 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx5a.cs" />
+    <Compile Include="waitanyex5a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
index 6f908ff0ef..f668197ff9 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx6.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex6.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj
index 48bc04141f..a5c1bf75a4 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx6a.cs" />
+    <Compile Include="waitanyex6a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
index 5e2931e5d7..7bd9eef6a6 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx7.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex7.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj
index 418582fc21..69937cff6b 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx7a.cs" />
+    <Compile Include="waitanyex7a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
index c7e42df08e..d49015a362 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx8.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex8.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
index c59e08f3c5..ab055d1f54 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx8a.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex8a.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
index 124fd7f68d..4cb70cbf51 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
@@ -24,8 +24,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx9.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitanyex9.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj
index 445ad8132c..4939c2e075 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitAnyEx9a.cs" />
+    <Compile Include="waitanyex9a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj
index 649bea0a47..e3a5de9eb2 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="NullArray.cs" />
+    <Compile Include="nullarray.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
index 33447499b5..e0c574f8a3 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx1.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitoneex1.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj
index b9338d919f..1534922dc5 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx1a.cs" />
+    <Compile Include="waitoneex1a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
index 4ff86afef0..5f8a271c5f 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx2.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitoneex2.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj
index 0f0cf4238e..9e98a7d0c6 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx2a.cs" />
+    <Compile Include="waitoneex2a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
index a75e702cd9..5ec416d050 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx3.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitoneex3.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj
index 4bb18c622b..a147c16143 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx3a.cs" />
+    <Compile Include="waitoneex3a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
index f68f9d758c..a3c992cd42 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx4.cs" />
-    <Compile Include="..\WaitHandleCommon.cs" />
+    <Compile Include="waitoneex4.cs" />
+    <Compile Include="..\waithandlecommon.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj
index 6e6d8af24a..e48ab25df8 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Add Compile Object Here -->
-    <Compile Include="WaitOneEx4a.cs" />
+    <Compile Include="waitoneex4a.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props
index 5a7ee2e83a..0d2035c027 100644
--- a/tests/src/dir.common.props
+++ b/tests/src/dir.common.props
@@ -37,7 +37,7 @@
   <PropertyGroup>
     <OSPlatformConfig>$(BuildOS).$(Platform).$(Configuration)</OSPlatformConfig>
     <BaseOutputPath>$(ProjectDir)\..\bin\tests</BaseOutputPath>
-    <BaseOutputPath Condition="'$(__TestRootDir)' != ''">$(__TestRootDir)\</BaseOutputPath>
+    <BaseOutputPath Condition="'$(__TestRootDir)' != ''">$(__TestRootDir)</BaseOutputPath>
     <BaseOutputPathWithConfig>$(BaseOutputPath)\$(OSPlatformConfig)\</BaseOutputPathWithConfig>
     <BinDir>$(BaseOutputPathWithConfig)</BinDir>
     <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath>
diff --git a/tests/src/dir.props b/tests/src/dir.props
index abad765fe4..7f1f523cc4 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -18,11 +18,11 @@
 
   <!-- Expose the target OS in a more convenient fashion -->
   <PropertyGroup>
-    <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Windows'))">Windows_NT</OSGroup>
-    <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Linux'))">Linux</OSGroup>
-    <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('OSX'))">OSX</OSGroup>
-    <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('FreeBSD'))">FreeBSD</OSGroup>
-    <OSGroup Condition="'$(OSGroup)'==''">Windows_NT</OSGroup>
+    <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('Windows'))">Windows_NT</OSGroup>
+    <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('Linux'))">Linux</OSGroup>
+    <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('OSX'))">OSX</OSGroup>
+    <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('FreeBSD'))">FreeBSD</OSGroup>
+    <OSGroup Condition="'$(OSGroup)'==''">AnyOS</OSGroup>
   </PropertyGroup>
 
   <!-- Setup properties per OSGroup -->
diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 4e6c618021..63630e8fa7 100644
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -103,7 +103,6 @@
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage>
   </PropertyGroup>
   
-  <!-- TODO (#1122): import this from the ToolsDir once it becomes available --> 
   <Import Project="$(ProjectDir)src\IL.targets" Condition="'$(ProjectLanguage)' == 'IL' And '$(CLRTestPriority)' &lt;= '$(CLRTestPriorityToBuild)'" />
 
 
@@ -147,12 +146,13 @@
           Condition="'@(NativeProjectReferenceNormalized)' != ''"
           BeforeTargets="Build" >
      <ItemGroup>
-        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\"/>
+        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))" Condition="'$(RunningOnUnix)' == 'true'" />
+        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(RunningOnUnix)' != 'true'" />
      </ItemGroup>
 
     <Message Text= "Full native project references are :%(NativeProjectReferenceNormalized.Identity)" />
     <Message Text= "Native binaries will be copied from :%(NativeProjectOutputFoldersToCopy.Identity)" />
-   <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != ''" />
+   <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != '' And '$(RunningOnUnix)' != 'true'" />
 
   </Target>
 
diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index 6ae2b7c09e..3a5906c1c6 100644
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -14,10 +14,10 @@
 
   <Target Name="ResolveDisabledProjects" BeforeTargets="BuildAllProjects" >
     <ItemGroup>
-      <DisabledProjects Include="TestWrappers*\*\*.csproj" />
+      <DisabledProjects Include="TestWrappers*\**\*.csproj" />
       <DisabledProjects Include="*\**\cs_template.csproj" />
-      <DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' != 'true'" />
-      <DisabledProjects Include="Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" />
+      <DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="('$(BuildTestsAgainstPackages)' != 'true') And ('$(BuildOS)' == 'Windows_NT')" />
+      <DisabledProjects Include="Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="('$(BuildTestsAgainstPackages)' == 'true') Or ('$(BuildOS)' != 'Windows_NT')" />
       <DisabledProjects Include="Common\test_runtime\test_runtime.csproj" />
       <DisabledProjects Include="Common\test_dependencies\test_dependencies.csproj" />
       <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" />
@@ -25,11 +25,116 @@
       <DisabledProjects Include="Common\external\external.csproj" />
       <DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" />
       <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" />
-      <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" />
+      <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="('$(BuildTestsAgainstPackages)' == 'true') Or ('$(BuildOS)' != 'Windows_NT')" />
       <DisabledProjects Include="JIT\config\**" />
       <DisabledProjects Include="Performance\performance.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
+      <DisabledProjects Include="JIT\Directed\nullabletypes\**\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Performance\CodeQuality\Span\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <!-- The following project requires System.Reflection.Emit which is not supported on Linux, see issue corefx@4491 -->
+      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67414\b67414.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <!-- The following projects cannot be compiled on Linux due to "csc.exe /debug:+" issue. Remove them after compiler will be fixed -->
+      <DisabledProjects Include="JIT\Directed\Misc\gettype\gettypetypeofmatrix.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\PREFIX\PrimitiveVT\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_d.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_do.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_d.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_do.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv3_il_d.ilproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv3_il_r.ilproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\gettypetypeof\gettypetypeofmatrix.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\int16_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\int16_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\int32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\int32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\int64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\int64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint16_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint16_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint64Opt_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint64Opt_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint8_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Directed\shift\uint8_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Generics\Constraints\Call_instance01_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Generics\Constraints\Call_instance01_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\Boxing\xlang\*.*" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\NaN\arithm32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\NaN\arithm32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\NaN\arithm64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\NaN\arithm64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\cctor\misc\throw_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\cctor\misc\throw_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\eh\**\*.*" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\flowgraph\bug619534\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Methodical\stringintern\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\b43313.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\b51875.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\b55197.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V2.0-RTM\b491215\b491215.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\v2.1\b152292\b152292.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\Dev11\External\Dev11_243742\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_1206929\DevDiv_1206929.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_142976\DevDiv_142976.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_150265\DevDiv_150265.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_168744\DevDiv_168744.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_200492\DevDiv_200492.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278365\DevDiv_278365.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278375\DevDiv_278375.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278376\DevDiv_278376.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278526\DevDiv_278526.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280120\DevDiv_280120.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280123\DevDiv_280123.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280127\DevDiv_280127.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_283795\DevDiv_283795.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_284785\DevDiv_284785.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_288222\DevDiv_288222.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10215\GitHub_10215.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10481\GitHub_10481.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10621\GitHub_10621.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10714\GitHub_10714.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_1296\GitHub_1296.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_1323\GitHub_1323.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_2580\GitHub_2580.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_2610\GitHub_2610.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_3449\GitHub_3449.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_4044\GitHub_4044.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_4115\GitHub_4115.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_5047\GitHub_5047.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_5696\GitHub_5696.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6238\GitHub_6238.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6239\GitHub_6239.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6318\GitHub_6318.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6649\GitHub_6649.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_7508\Vector3Test.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_7906\GitHub_7906.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8220\GitHub_8220.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8460\GitHub_8460.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8599\GitHub_8599.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_9891\GitHub_9891.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10780\GitHub_10780.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10940\GitHub_10940.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11343\GitHub_11343.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11408\GitHub_11408.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11689\GitHub_11689.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11733\GitHub_11733.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11814\GitHub_11814.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\jit64\eh\**\*.*" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\jit64\hfa\main\**\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\opt\virtualstubdispatch\manyintf\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
+      <DisabledProjects Include="JIT\jit64\opt\cse\hugeexpr1.csproj" Condition="'$(BuildOS)' == 'OSX'" />
+      <DisabledProjects Include="JIT\jit64\opt\cse\HugeField2.csproj" Condition="'$(BuildOS)' == 'OSX'" />
+      <DisabledProjects Include="JIT\jit64\opt\cse\hugeSimpleExpr1.csproj" Condition="'$(BuildOS)' == 'OSX'" />
+      <DisabledProjects Include="Loader\classloader\generics\Instantiation\Nesting\NestedGenericStructs.csproj" Condition="'$(BuildOS)' == 'OSX'" />
     </ItemGroup>
     
     <ItemGroup>
diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt
index 3b59343f8a..7417d28918 100644
--- a/tests/testsFailingOutsideWindows.txt
+++ b/tests/testsFailingOutsideWindows.txt
@@ -1,3 +1,4 @@
+baseservices/threading/paramthreadstart/ThreadStartBool_1/ThreadStartBool_1.sh
 baseservices/threading/paramthreadstart/ThreadStartString_1/ThreadStartString_1.sh
 CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCtor/MulticastDelegateCtor.sh
 CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalGetLastWin32Error_PSC/MarshalGetLastWin32Error_PSC.sh
author	Roman Artemev <rartemev@microsoft.com>	2017-06-01 12:27:23 -0700
committer	GitHub <noreply@github.com>	2017-06-01 12:27:23 -0700
commit	f86fd75c111fc28554f1c846a8abc472cc2f67b6 (patch)
tree	43010c7bfde2f634d15de8006a734993798d8ffb
parent	148d418dca9045167e1e5b74129faa78d9c5ed73 (diff)
parent	df8dca2f2f3a5dd22b9db727e581a3c13fbe403a (diff)
download	coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.tar.gz coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.tar.bz2 coreclr-f86fd75c111fc28554f1c846a8abc472cc2f67b6.zip