Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions
--- a/external/corert/tests/CoreCLR.issues.targets
+++ b/external/corert/tests/CoreCLR.issues.targets
@@ -10,6 +10,8 @@
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\NaN\intrinsic_cs_do\intrinsic_cs_do.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\pow\pow1\pow1.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\NaN\intrinsic_cs_r\intrinsic_cs_r.*" />
+    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\Samples\gc\gc.*" />
+    <ExcludeList Include="$(XunitTestBinBase)\GC\Features\Pinning\PinningOther\PinnedObject\PinnedObject.*" />

    <!-- Infinite generic expansion -->
    <!-- https://github.com/dotnet/corert/issues/363 -->
@@ -36,155 +38,10 @@
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\VT\callconv\_il_dbgvtret\_il_dbgvtret.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\VT\callconv\_il_relvtret\_il_relvtret.*" />
    
-    <!-- CreateInstance<T> -->
-    <!-- https://github.com/dotnet/corert/issues/368 -->
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_6\Generic_Test_CSharp_Base_6.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_6\Generic_Test_CSharp_Peer_6.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class1_cs_d\class1_cs_d.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class1_cs_do\class1_cs_do.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class1_cs_r\class1_cs_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class1_cs_ro\class1_cs_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class2_cs_d\class2_cs_d.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class2_cs_do\class2_cs_do.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class2_cs_r\class2_cs_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\class2_cs_ro\class2_cs_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\vt4_cs_d\vt4_cs_d.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\vt4_cs_do\vt4_cs_do.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\vt4_cs_r\vt4_cs_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Generics\ConstrainedCall\vt4_cs_ro\vt4_cs_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\generics\regressions\341477\Test\Test.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\dev10_568786\4_Misc\SealedTypes\SealedTypes.*" />
-
    <!-- System.Reflection.Emit.Lightweight -->
    <!-- https://github.com/dotnet/corert/issues/370 -->
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\dynamic_methods\bug_445388\bug_445388.*" />

-    <!-- SIMD -->
-    <!-- https://github.com/dotnet/corert/issues/370 -->
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AbsGeneric\AbsGeneric.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AbsSqrt\AbsSqrt.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AddingSequence\AddingSequence.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BitwiseOperations\BitwiseOperations.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BoxUnbox\BoxUnbox.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BugWithAVX\BugWithAVX.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex\CircleInConvex.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CreateGeneric\CreateGeneric.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CtorFromArray\CtorFromArray.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ctors\Ctors.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\DivSignedUnsignedTest\DivSignedUnsignedTest.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Dup\Dup.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Haar-likeFeaturesGeneric\Haar-likeFeaturesGeneric.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ldfld\Ldfld.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\LdfldGeneric\LdfldGeneric.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ldind\Ldind.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\MinMax\MinMax.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Mul\Mul.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\SqrtGeneric\SqrtGeneric.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\StoreElement\StoreElement.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Sums\Sums.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3\Vector3.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector4\Vector4.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AbsGeneric_r\AbsGeneric_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AbsGeneric_ro\AbsGeneric_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AbsSqrt_r\AbsSqrt_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AbsSqrt_ro\AbsSqrt_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AddingSequence_r\AddingSequence_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\AddingSequence_ro\AddingSequence_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BitwiseOperations_r\BitwiseOperations_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BitwiseOperations_ro\BitwiseOperations_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BoxUnbox_r\BoxUnbox_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BoxUnbox_ro\BoxUnbox_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BugWithAVX_r\BugWithAVX_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BugWithAVX_ro\BugWithAVX_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_r\CircleInConvex_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_ro\CircleInConvex_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CreateGeneric_r\CreateGeneric_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CreateGeneric_ro\CreateGeneric_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CtorFromArray_r\CtorFromArray_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CtorFromArray_ro\CtorFromArray_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ctors_r\Ctors_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ctors_ro\Ctors_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\DivSignedUnsignedTest_r\DivSignedUnsignedTest_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\DivSignedUnsignedTest_ro\DivSignedUnsignedTest_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Dup_r\Dup_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Dup_ro\Dup_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Haar-likeFeaturesGeneric_r\Haar-likeFeaturesGeneric_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Haar-likeFeaturesGeneric_ro\Haar-likeFeaturesGeneric_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\LdfldGeneric_r\LdfldGeneric_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\LdfldGeneric_ro\LdfldGeneric_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ldfld_r\Ldfld_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ldfld_ro\Ldfld_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ldind_r\Ldind_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Ldind_ro\Ldind_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\MinMax_r\MinMax_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\MinMax_ro\MinMax_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Mul_r\Mul_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Mul_ro\Mul_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\SqrtGeneric_r\SqrtGeneric_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\SqrtGeneric_ro\SqrtGeneric_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\StoreElement_r\StoreElement_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\StoreElement_ro\StoreElement_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Sums_r\Sums_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Sums_ro\Sums_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3_r\Vector3_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3_ro\Vector3_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector4_r\Vector4_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector4_ro\Vector4_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorAbs_r\VectorAbs_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorAbs_ro\VectorAbs_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorAdd_r\VectorAdd_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorAdd_ro\VectorAdd_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorArgs_r\VectorArgs_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorArgs_ro\VectorArgs_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorArrayInit_r\VectorArrayInit_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorArrayInit_ro\VectorArrayInit_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorArray_r\VectorArray_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorArray_ro\VectorArray_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorCopyToArray_r\VectorCopyToArray_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorCopyToArray_ro\VectorCopyToArray_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorDiv_r\VectorDiv_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorDiv_ro\VectorDiv_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorDot_r\VectorDot_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorDot_ro\VectorDot_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorExp_r\VectorExp_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorExp_ro\VectorExp_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorGet_r\VectorGet_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorGet_ro\VectorGet_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorHWAccel2_r\VectorHWAccel2_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorHWAccel2_ro\VectorHWAccel2_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorHWAccel_r\VectorHWAccel_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorHWAccel_ro\VectorHWAccel_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorInitN_r\VectorInitN_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorInitN_ro\VectorInitN_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorInit_r\VectorInit_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorInit_ro\VectorInit_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorIntEquals_r\VectorIntEquals_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorIntEquals_ro\VectorIntEquals_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMatrix_r\VectorMatrix_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMatrix_ro\VectorMatrix_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMax_r\VectorMax_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMax_ro\VectorMax_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMin_r\VectorMin_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMin_ro\VectorMin_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMul_r\VectorMul_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorMul_ro\VectorMul_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorRelOp_r\VectorRelOp_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorRelOp_ro\VectorRelOp_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorReturn_r\VectorReturn_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorReturn_ro\VectorReturn_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorSet_r\VectorSet_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorSet_ro\VectorSet_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorSqrt_r\VectorSqrt_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorSqrt_ro\VectorSqrt_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorSub_r\VectorSub_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorSub_ro\VectorSub_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorUnused_r\VectorUnused_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\VectorUnused_ro\VectorUnused_ro.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\GitHub_6318\GitHub_6318\GitHub_6318.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\GitHub_7906\GitHub_7906\GitHub_7906.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3Interop_r\Vector3Interop_r.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3Interop_ro\Vector3Interop_ro.*" />
-
    <!-- Test has expectations about CoreRun and running on CoreCLR -->
    <ExcludeList Include="$(XunitTestBinBase)\Loader\NativeLibs\FromNativePaths\FromNativePaths.*" />

@@ -192,6 +49,9 @@
    <!-- https://github.com/dotnet/corert/issues/370 -->
    <ExcludeList Include="$(XunitTestBinBase)\managed\Compilation\Compilation\Compilation.*" />

+    <!-- System.Runtime.CompilerServices.Unsafe -->
+    <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\tests\UnsafeBlockCopy\UnsafeBlockCopy.*" />
+
    <!-- These depend on things outside of the .NET Core profile. Need test fixes. -->
    <ExcludeList Include="$(XunitTestBinBase)\Interop\NativeCallable\NativeCallableTest\NativeCallableTest.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-RTM\b475589\b475589\b475589.*" />
@@ -288,20 +148,9 @@
    <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\opt\cse\HugeArray1\HugeArray1.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\opt\cse\hugeexpr1\hugeexpr1.*" />

-    <!-- Generic virtual methods -->
-    <!-- https://github.com/dotnet/corert/issues/3454 -->
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b210352\csharptester\csharptester.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\generics\Variance\Regressions\dev10_468712\dev10_468712\dev10_468712.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\methodoverriding\regressions\dev10_432038\dev10_432038\dev10_432038.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\dev10_398410\dev10_398410\dev10_398410.*" />
-
    <!-- Reflection enabling a virtual method methodimpl'd by other virtual method -->
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\methodoverriding\regressions\576621\VSW576621\VSW576621.*" />

-    <!-- DynamicInvoke stub for a method with 8192 parameters -->
-    <!-- https://github.com/dotnet/corert/issues/2349 -->
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b191926\b191926\b191926.*" />
-    
    <!-- Bogus MethodImpls -->
    <!-- https://github.com/dotnet/corert/issues/2350 -->
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\MethodImpl\self_override3\self_override3.*" />
@@ -439,6 +288,8 @@
    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\Dynamo\dynamo\dynamo.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09\b16294\b16294\b16294.*" />
    <ExcludeList Include="$(XunitTestBinBase)\Regressions\common\AboveStackLimit\AboveStackLimit.*" /> 
+    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3Interop_r\Vector3Interop_r.*" />
+    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\Vector3Interop_ro\Vector3Interop_ro.*" />

    <!-- System.Diagnostics.Process -->
    <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\Collect_Default_1\Collect_Default_1.*" />
@@ -526,6 +377,10 @@
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\interactions\throw2dimarray_d\throw2dimarray_d.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\interactions\throw2dimarray_r\throw2dimarray_r.*" />

+    <!-- Rethrown exceptions don't clear stack trace -->
+    <!-- https://github.com/dotnet/corert/issues/5183 -->
+    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\529206\vsw529206StaticCctor\vsw529206StaticCctor.*" />    
+
    <!-- PInvoke Ansi/Widechar entrypoint probing -->
    <!-- https://github.com/dotnet/corert/issues/730 -->
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\tail\tail.*" />
@@ -568,6 +423,7 @@
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TSAmbiguities\CollapsedMethods\InterfaceImplementation\HelloWorld\HelloWorld.*" />
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TSAmbiguities\CollapsedMethods\Override\HelloWorld\HelloWorld.*" />
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\dev10_568786\4_Misc\Variance2\Variance2.*" />
+    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\dev10_568786\4_Misc\SealedTypes\SealedTypes.*" /> 

    <!-- Marshal.GetExceptionForHR not setting HResult -->
    <!-- https://github.com/dotnet/corert/issues/2256 -->
@@ -599,10 +455,6 @@
    <!-- https://github.com/dotnet/corert/issues/2272 -->
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\oldtests\callipinvoke\callipinvoke.*" />

-    <!-- Newarr void -->
-    <!-- https://github.com/dotnet/corert/issues/2280 -->
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.*" />
-    
    <!-- Bad check for Explicit/Sequential layout -->
    <!-- https://github.com/dotnet/corert/issues/2281 -->
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\generics\Layout\General\Base01d_seq_ser\Base01d_seq_ser.*" />
@@ -645,10 +497,6 @@
    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\LeakGen\leakgen\leakgen.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\lifetime\lifetime2\lifetime2.*" />

-    <!-- InteropExtensions.MightBeBlittable is only an approximation -->
-    <!-- https://github.com/dotnet/corert/issues/2355 -->
-    <ExcludeList Include="$(XunitTestBinBase)\GC\Features\Pinning\PinningOther\PinnedObject\PinnedObject.*" />
-
    <!-- Pay for play reflection -->
    <ExcludeList Include="$(XunitTestBinBase)\CoreMangLib\system\delegate\miscellaneous\ClosedStatic\ClosedStatic.*" />
    <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\regressions\14610\TestObjectGetTypeVirtual\TestObjectGetTypeVirtual.*" />
@@ -723,17 +571,6 @@
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Arrays\misc\_speed_dbgarrres\_speed_dbgarrres.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Arrays\misc\_relarrres\_relarrres.*" />

-    <!-- Tests that fail after RyuJIT update -->
-    <!-- https://github.com/dotnet/corert/issues/2782 -->
-    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\doublinkstay\doublinkstay.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\doublinkgen\doublinkgen.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\FinalNStruct\nstructresur\nstructresur.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\NDPin\ndpinfinal\ndpinfinal.*" />
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinning\object-pin\object-pin\object-pin.*" />
-
-    <!-- More failing GC tests -->
-    <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\Samples\gc\gc.*" />
-
    <!-- Variant interface method resolution -->
    <!-- https://github.com/dotnet/corert/issues/2358 -->
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\inlining\dev10_bug719093\variancesmall\variancesmall.*" />
@@ -809,6 +646,8 @@
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\fp\apps\bouncingball_cs_d\bouncingball_cs_d.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\perf\doublealign\Locals\Locals.*" />
    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M02\b00719\b00719\b00719.*" />
+    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BitwiseOperations_r\BitwiseOperations_r.*" />
+    <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\BitwiseOperations_ro\BitwiseOperations_ro.*" />

    <!-- Crossgen tests, not runtime tests -->
    <ExcludeList Include="$(XunitTestBinBase)\readytorun\genericsload\callgenericctor\callgenericctor.*" />
--- a/external/corert/tests/CoreCLR/Test.csproj
+++ b/external/corert/tests/CoreCLR/Test.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="LinkNative" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <PropertyGroup>
    <TargetName>$(TestFileName)</TargetName>
@@ -12,9 +12,10 @@
    <!-- Some tests consist of multiple assemblies - make sure ILC sees them -->
    <IlcCompileInput Include="$(MSBuildProjectDirectory)\*.dll" />
  </ItemGroup>
-  
-  <Import Project="$(CoreRT_TestRoot)\Test.Common.targets" />
-  
+
  <!-- Since tests are already compiled, override Compile target to prevent CSC running -->
  <Target Name="Compile" />
+
+  <Import Project="$(IlcPath)\build\Microsoft.NETCore.Native.targets" />
+
 </Project>
--- a/external/corert/tests/CoreCLR/build-and-run-test.cmd
+++ b/external/corert/tests/CoreCLR/build-and-run-test.cmd
@@ -20,13 +20,6 @@ set TestFileName=%~n2

 copy /Y %~dp0\Test.csproj %TestFolder%

-::
-:: Clear Core_Root before invoking MSBuild. This is important, because we need it set to the CoreCLR
-:: test payload's CoreCLR folder while running the test infrastructure, but when msbuild launches
-:: the CoreRT CoreCLR to run ILC.exe, Core_Root affects the binder and we probe for assemblies in
-:: the wrong place.
-set CORE_ROOT=
-
 ::
 :: The CoreCLR test system configures the VS environment as 32-bit by default,
 :: so override if we're doing a 64-bit test run
@@ -35,8 +28,8 @@ if "%CoreRT_BuildArch%" == "x64" (
    call "%VS140COMNTOOLS%\..\..\VC\bin\amd64\vcvars64.bat"
 )

-echo msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\..\bin\obj\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /p:DisableFrameworkLibGeneration=true %TestFolder%\Test.csproj
-msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\..\bin\obj\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /p:DisableFrameworkLibGeneration=true %TestFolder%\Test.csproj
+echo msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /p:DisableFrameworkLibGeneration=true %TestFolder%\Test.csproj
+msbuild /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /p:DisableFrameworkLibGeneration=true %TestFolder%\Test.csproj
 if errorlevel 1 (
    set TestExitCode=!ERRORLEVEL!
    goto :Cleanup
--- a/external/corert/tests/CoreCLR/dependencies.props
+++ b/external/corert/tests/CoreCLR/dependencies.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
  <PropertyGroup>
    <CoreFxCurrentRef>9f9f1cf6e6c4a969e8d0158936427b9896300035</CoreFxCurrentRef>
--- a/external/corert/tests/CoreCLR/runtest/dir.props
+++ b/external/corert/tests/CoreCLR/runtest/dir.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\dir.props" />
  <!--
    $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
@@ -13,14 +13,6 @@
    <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName>
  </PropertyGroup>

-  <!--   
-    Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer   
-    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>
-    <BuildToolsTargetsDesktop>true</BuildToolsTargetsDesktop>   
-  </PropertyGroup>  
-
  <!-- Common repo directories -->
  <PropertyGroup>
    <CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)'==''">false</CopyNuGetImplementations>
@@ -29,41 +21,18 @@
    <PackagesDir>$(ProjectDir)..\..\..\packages\</PackagesDir>
    <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir>
    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
-    <BuildToolsTaskDir Condition="'$(BuildToolsTargetsDesktop)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir>
    <SkipImportILTargets>true</SkipImportILTargets>
  </PropertyGroup>
  
  <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. -->
  <Import Project="$(MSBuildThisFileDirectory)\..\dependencies.props" />

-  <!-- Common nuget properties -->
-  <PropertyGroup>
-    <NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath>
-    <NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile>
-    <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine>
-
-    <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand>
-    <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
-    <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on
-         the path. -->
-    <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand>
-    <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
-    <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand>
-    <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
-  </PropertyGroup>
-
-   <!-- list of nuget package sources passed to dnu --> 
-   <ItemGroup> 
-     <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> 
-     <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> 
-     <DnuSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> 
-   </ItemGroup> 
-
-  
-  <!-- list of directories to perform batch restore -->
-  <ItemGroup>
-    <DnuRestoreDir Include="&quot;$(MSBuildProjectDirectory)\src&quot;" />
-  </ItemGroup>
+  <!-- list of nuget package sources passed to dnu --> 
+  <ItemGroup> 
+    <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
+    <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> 
+  </ItemGroup> 
  
  <PropertyGroup Condition="'$(BuildAllProjects)'=='true'">
    <!-- When we do a traversal build we get all packages up front, don't restore them again -->
--- a/external/corert/tests/CoreCLR/runtest/dir.targets
+++ b/external/corert/tests/CoreCLR/runtest/dir.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  
  <Target Name="CheckForBuildTools">
    <Error Condition="!Exists('$(ToolsDir)')"
--- a/external/corert/tests/CoreCLR/runtest/issues.targets
+++ b/external/corert/tests/CoreCLR/runtest/issues.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\271010\*">
--- a/external/corert/tests/CoreCLR/runtest/publishdependency.targets
+++ b/external/corert/tests/CoreCLR/runtest/publishdependency.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
  <ItemGroup>
--- a/external/corert/tests/CoreCLR/runtest/runtest.cmd
+++ b/external/corert/tests/CoreCLR/runtest/runtest.cmd
@@ -7,10 +7,8 @@ set __BuildType=Debug
 set __BuildOS=Windows_NT

 :: Default to highest Visual Studio version available
-set __VSVersion=vs2015
-
-if defined VS120COMNTOOLS set __VSVersion=vs2013
-if defined VS140COMNTOOLS set __VSVersion=vs2015
+set __VSVersion=vs2017
+set __VSProductVersion=150

 :: Define a prefix for most output progress messages that come from this script. That makes
 :: it easier to see where these are coming from. Note that there is a trailing space here.
@@ -48,9 +46,6 @@ if /i "%1" == "debug"                 (set __BuildType=Debug&shift&goto Arg_Loop
 if /i "%1" == "release"               (set __BuildType=Release&shift&goto Arg_Loop)
 if /i "%1" == "checked"               (set __BuildType=Checked&shift&goto Arg_Loop)

-if /i "%1" == "vs2013"                (set __VSVersion=%1&shift&goto Arg_Loop)
-if /i "%1" == "vs2015"                (set __VSVersion=%1&shift&goto Arg_Loop)
-
 if /i "%1" == "SkipWrapperGeneration" (set __SkipWrapperGeneration=true&shift&goto Arg_Loop)
 if /i "%1" == "Exclude"               (set __Exclude=%2&shift&shift&goto Arg_Loop)
 if /i "%1" == "Exclude0"              (set __Exclude0=%2&shift&shift&goto Arg_Loop)
@@ -96,31 +91,15 @@ if not defined XunitTestReportDirBase set  XunitTestReportDirBase=%XunitTestBinB

 if not exist %__LogsDir% md %__LogsDir%

-set __VSProductVersion=
-if /i "%__VSVersion%" == "vs2013" set __VSProductVersion=120
-if /i "%__VSVersion%" == "vs2015" set __VSProductVersion=140
-
 :: Check presence of VS
 if not defined VS%__VSProductVersion%COMNTOOLS goto NoVS

 set __VSToolsRoot=!VS%__VSProductVersion%COMNTOOLS!
 if %__VSToolsRoot:~-1%==\ set "__VSToolsRoot=%__VSToolsRoot:~0,-1%"

-:: Does VS really exist?
-if not exist "%__VSToolsRoot%\..\IDE\devenv.exe"      goto NoVS
-if not exist "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" goto NoVS
-if not exist "%__VSToolsRoot%\VsDevCmd.bat"           goto NoVS
+set _msbuildexe="%VSINSTALLDIR%\MSBuild\15.0\Bin\MSBuild.exe"

-if /i "%__VSVersion%" =="vs2015" goto MSBuild14
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
-goto :CheckMSBuild14
-:MSBuild14
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
-:CheckMSBuild14
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe.  Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1
+if not exist !_msbuildexe! (echo Error: Could not find MSBuild.exe.  Please see https://github.com/dotnet/corert/blob/master/Documentation/prerequisites-for-building.md for build instructions. && exit /b 1)

 :: Set the environment for the  build- VS cmd prompt
 echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\VsDevCmd.bat"
@@ -192,11 +171,6 @@ if  defined __GenerateLayoutOnly (
    exit /b 1
 )

-if not exist %CORE_ROOT%\coreclr.dll (
-    echo %__MsgPrefix%Error: Ensure you have done a successful build of the Product and %CORE_ROOT% contains runtime binaries.
-    exit /b 1
-)
-
 ::Check if the test Binaries are built
 if not exist %XunitTestBinBase% (
    echo %__MsgPrefix%Error: Ensure the Test Binaries are built and are present at %XunitTestBinBase%.
@@ -378,6 +352,6 @@ echo CORE_ROOT The path to the runtime
 exit /b 1

 :NoVS
-echo Visual Studio 2013+ ^(Community is free^) is a prerequisite to build this repository.
+echo Visual Studio 2017 ^(Community is free^) is a prerequisite to build this repository.
 echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
 exit /b 1
--- a/external/corert/tests/CoreCLR/runtest/runtest.proj
+++ b/external/corert/tests/CoreCLR/runtest/runtest.proj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="src\dir.props" />
  <Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets') AND '$(BuildWrappers)' == 'true'" /> 
  <Import Project="helixperftasks.targets" Condition="'$(Performance)'=='true'"/> 
@@ -66,30 +65,23 @@ $(_XunitEpilog)
      </_XunitWrapperGen>
      <XunitWrapperGenCsProj>
        <![CDATA[
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    
  <Import Project="$(SourceDir)dir.props" />
  <PropertyGroup>
    <Configuration Condition=" '%24(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '%24(Platform)' == '' ">AnyCPU</Platform>
    <AssemblyName>$(XunitWrapper)</AssemblyName>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
    <OutputType>Library</OutputType>
    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>net45</TargetFramework>
    <IsXunitWrapperProject>true</IsXunitWrapperProject>
    <SkipSigning>true</SkipSigning>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    <CLRTestKind>BuildOnly</CLRTestKind>
    <IsTestProject>true</IsTestProject>
-    <ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson>
-    <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson>
+    <RestoreOutputPath>%24(IntermediateOutputRootPath)\XUnitTooling</RestoreOutputPath>
    <ReferencePath>$(ReferencePath);$(XunitTestBinBase)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper</ReferencePath>
  </PropertyGroup>
  <!-- Default configurations to help VS understand the configurations -->
@@ -110,13 +102,13 @@ $(_XunitEpilog)
    <Reference Include="mscorlib" />
    <Reference Include="$(XunitTestBinBase)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper\Coreclr.TestWrapper.dll" />
  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson>
-    <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson>
-  </PropertyGroup>
  <Import Project="$(SourceDir)dir.targets" />
  <PropertyGroup>
-     <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir>
+    <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_TargetFrameworkDirectories />
+    <_FullFrameworkReferenceAssemblyPaths />
  </PropertyGroup>
 </Project>
        ]]>
--- a/external/corert/tests/CoreCLR/runtest/runtest.sh
+++ b/external/corert/tests/CoreCLR/runtest/runtest.sh
@@ -209,8 +209,7 @@ function xunit_output_end {
        ((errorCount = 1))
    fi

-    echo '<?xml version="1.0" encoding="utf-8"?>' >>"$xunitOutputPath"
-    echo '<assemblies>' >>"$xunitOutputPath"
+    echo '<assemblies>' >"$xunitOutputPath"

    local line

@@ -559,7 +558,7 @@ function set_up_core_dump_generation {
            # Include memory in private and shared file-backed mappings in the dump.
            # This ensures that we can see disassembly from our shared libraries when
            # inspecting the contents of the dump. See 'man core' for details.
-            echo 0x3F > /proc/self/coredump_filter
+            echo -n 0x3F > /proc/self/coredump_filter
        fi
    fi
 }
--- a/external/corert/tests/CoreCLR/runtest/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/external/corert/tests/CoreCLR/runtest/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
--- a/external/corert/tests/CoreCLR/runtest/src/TestWrappersConfig/XUnitTooling.depproj
+++ b/external/corert/tests/CoreCLR/runtest/src/TestWrappersConfig/XUnitTooling.depproj
@@ -1,29 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-<!--
-  This project is servicing the purpose of restoring some nuget packages which has the implementation assemblies 
-  like System.Collections, System.Resources.ResourceManager…etc. 
-  The restored implementation assemblies will be used as references for compiling some of the System.Private.* 
-  projects like System.Private.Threading. 
-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
  <Import Project="..\..\..\..\..\dir.props" />
  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <OutputPath>$(AotPackageReferencePath)</OutputPath>
-    <ResolvePackages>true</ResolvePackages>
-    <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
-    <ProjectJson>project.json</ProjectJson>
-    <ProjectLockJson>project.lock.json</ProjectLockJson>
+    <TargetFramework>net45</TargetFramework>
+    <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
  </PropertyGroup>
  <ItemGroup>
-    <None Include="project.json" />
+    <PackageReference Include="xunit">
+      <Version>$(XunitPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.assert">
+      <Version>$(XunitPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.core">
+      <Version>$(XunitPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.msbuild">
+      <Version>$(XunitPackageVersion)</Version>
+    </PackageReference>
  </ItemGroup>

  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-
-  <PropertyGroup>
-    <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker>
-    <NuGetRuntimeIdentifier>win8-aot</NuGetRuntimeIdentifier>
-  </PropertyGroup>
-</Project>
+</Project>
--- a/external/corert/tests/CoreCLR/runtest/src/TestWrappersConfig/project.json
+++ b/external/corert/tests/CoreCLR/runtest/src/TestWrappersConfig/project.json
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "xunit": "2.2.0-beta2-build3300",
-    "xunit.assert": "2.2.0-beta2-build3300",
-    "xunit.core": "2.2.0-beta2-build3300",
-    "xunit.runner.msbuild": "2.2.0-beta2-build3300"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",  
-        "portable-net45+win8"
-      ]
-    },
-    "net45": {
-      "imports": "portable-net45+win8"
-    }
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {}
-  }
-}
--- a/external/corert/tests/CoreCLR/runtest/src/dir.common.props
+++ b/external/corert/tests/CoreCLR/runtest/src/dir.common.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\dir.props" />

 <!-- Set default Configuration and Platform -->
--- a/external/corert/tests/CoreCLR/runtest/src/dir.props
+++ b/external/corert/tests/CoreCLR/runtest/src/dir.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="dir.common.props" />

  <!-- Disable some standard properties for building our projects -->
@@ -11,8 +11,6 @@
    <NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008</NoWarn>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
    <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning>
-    <!-- Set the project.json directory for generated TestWrappers. -->
-    <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory>
  </PropertyGroup>

  <!-- Expose the target OS in a more convenient fashion -->
@@ -81,9 +79,4 @@
  <PropertyGroup>
    <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire>
  </PropertyGroup>
-  
-  <PropertyGroup>
-    <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson>
-    <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
 </Project>
--- a/external/corert/tests/CoreCLR/runtest/src/dir.targets
+++ b/external/corert/tests/CoreCLR/runtest/src/dir.targets
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <!-- Default priority building values. -->
  <PropertyGroup>
    <CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Library'">SharedLibrary</CLRTestKind>
@@ -50,11 +50,6 @@
    <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(ReferenceLocalMscorlib)' == 'true'">
-    <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson>
-    <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-
  <!--
  If it needs ProjectToRun, turn the project into a ProjectReference so it gets built
  -->
@@ -63,11 +58,7 @@
      <Private>false</Private>
    </ProjectReference>
  </ItemGroup>
-        
-  <PropertyGroup>
-    <ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject>
-  </PropertyGroup>
-  
+
  <Import Project="..\dir.targets" />

  <Target Name="CreateManifestResourceNames" />
--- a/external/corert/tests/CoreCLR/runtest/tests.targets
+++ b/external/corert/tests/CoreCLR/runtest/tests.targets
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <UsingTask AssemblyFile="$(PackagesDir)xunit.runner.msbuild\$(XunitPackageVersion)\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
  
--- a/external/corert/tests/CoreCLR/runtest/xunitwrapper.targets
+++ b/external/corert/tests/CoreCLR/runtest/xunitwrapper.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!-- This overrides the typical ResolveNuGetPackages so that it does copy local of the
     referenced items.  This is used so that we can correctly resolve and copy the libraries necessary
     to the core_root directory -->
@@ -6,13 +5,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Target Name="ResolveNuGetPackages">
 
-    <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))"
+    <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectAssetsFile))"
                                         AllowFallbackOnTargetSelection="true"
                                         IncludeFrameworkReferences="false"
                                         NuGetPackagesDirectory="$(PackagesDir)"
                                         RuntimeIdentifier="$(TestNugetRuntimeId)"
                                         ProjectLanguage="$(Language)"
-                                         ProjectLockFile="$(ProjectLockJson)"
+                                         ProjectLockFile="$(ProjectAssetsFile)"
                                         TargetMonikers="$(TargetFrameworkMoniker)">
      <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
      <Output TaskParameter="ResolvedReferences" ItemName="Reference" />
--- a/external/corert/tests/Test.Common.targets
+++ b/external/corert/tests/Test.Common.targets
@@ -1,13 +0,0 @@
-<Project ToolsVersion="14.0" DefaultTargets="LinkNative" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <CopyNuGetImplementations>false</CopyNuGetImplementations>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
-  </PropertyGroup>
-
-  <!-- Use the source primary copy for development convenience -->
-  <Import Project="$(MSBuildThisFileDirectory)\..\src\BuildIntegration\Microsoft.NETCore.Native.targets" />
-  <!-- <Import Project="$(IlcPath)\Microsoft.NETCore.Native.targets" /> -->
-</Project>
--- a/Show More
+++ b/Show More