diff --git a/build-test.sh b/build-test.sh
index 4d2d06fa0609..6907dbb69eaa 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -346,7 +346,7 @@ build_Tests_internal()
__msbuildErr="\"/flp2:ErrorsOnly;LogFile=${__BuildErr}\""
# Generate build command
- buildCommand="$__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog=${__msbuildLog} -MsBuildWrn=${__msbuildWrn} -MsBuildErr=${__msbuildErr} -MsBuildEventLogging=\"/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log\" $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs"
+ buildCommand="$__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog=${__msbuildLog} -MsBuildWrn=${__msbuildWrn} -MsBuildErr=${__msbuildErr} $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs"
echo "Building step '$stepName' via $buildCommand"
@@ -727,7 +727,7 @@ __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.
+# CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to it.
# This is needed by CLI to function.
if [ -z "$HOME" ]; then
if [ ! -d "$__ProjectDir/temp_home" ]; then
diff --git a/config.json b/config.json
index 406ea5189a13..52b533c3f8bc 100644
--- a/config.json
+++ b/config.json
@@ -76,7 +76,7 @@
"description": "MsBuild logging options.",
"valueType": "passThrough",
"values": [],
- "defaultValue": "/l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log"
+ "defaultValue": ""
},
"FilterToOSGroup": {
"description": "Specifies the OSGroup.",
diff --git a/tests/runtest.proj b/tests/runtest.proj
index c2abc3987ad2..91f3569c4ada 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -79,8 +79,10 @@ $(_XunitEpilog)
{95DFC527-4DC1-495E-97D7-E94EE1F7140D}
Library
.NETFramework
+ .NETCoreApp
v4.5
- netcoreapp2.0
+ v2.2
+ netcoreapp2.2
net45
true
true
diff --git a/tests/runtest.py b/tests/runtest.py
index 8819cee57275..35cd6da82c35 100755
--- a/tests/runtest.py
+++ b/tests/runtest.py
@@ -128,7 +128,7 @@ def call_msbuild(coreclr_repo_location,
common_msbuild_arguments = ["/nologo", "/nodeReuse:false", "/p:Platform=%s" % arch]
if sequential:
- common_msbuild_arguments += ["/p:ParrallelRun=false"]
+ common_msbuild_arguments += ["/p:ParallelRun=false"]
else:
common_msbuild_arguments += ["/maxcpucount"]
diff --git a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index 2e7abfe1bcee..ed42b4410fa4 100644
--- a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -1,10 +1,11 @@
-
+
Debug
AnyCPU
CoreclrTestWrapperLib
+ netcoreapp2.2
2.0
{95DFC527-4DC1-495E-97D7-E94EE1F7140D}
Library
diff --git a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj
index 76128421d2c9..5b31bf223e94 100644
--- a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj
+++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj
@@ -13,19 +13,26 @@
$(XunitPackageVersion)
+ All
+ All
$(XunitPackageVersion)
$(XunitPackageVersion)
+ All
$(XunitPackageVersion)
+ All
+
+
+ $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)
- netcoreapp1.1;net45
+ netcoreapp2.2
.NETCoreApp
$(PackageTargetFallback);dnxcore50;portable-net45+win8
$(TargetRid)