Imported Upstream version 2.0.0.11353upstream/2.0.0.11353

12 files changed, 173 insertions, 197 deletions

diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj
index f2222b9d61..a16ab06cd7 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
index f567de543f..d434600112 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
@@ -46,11 +46,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 B::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -68,8 +68,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -89,8 +89,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -108,8 +108,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -141,11 +141,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 D::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -163,8 +163,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -184,11 +184,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x1388
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 E::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -206,8 +206,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -239,8 +239,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -258,8 +258,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -316,85 +316,85 @@
     .entrypoint
     // Code size       302 (0x12e)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
-             class [mscorlib]System.Threading.Thread V_3,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
+             class [System.Threading.Thread]System.Threading.Thread V_3,
              int32 V_4,
              bool V_5)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetD()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldnull
     IL_005c:  ldftn      void Test::RunGetE()
-    IL_0062:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0062:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0067:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0067:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_006c:  stloc.3
     IL_006d:  ldloc.3
     IL_006e:  ldstr      "T4"
-    IL_0073:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0073:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_0078:  nop
     IL_0079:  ldloc.0
-    IL_007a:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_007a:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_007f:  nop
     IL_0080:  ldc.i4     0x3e8
-    IL_0085:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0085:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_008a:  nop
     IL_008b:  ldloc.1
-    IL_008c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_008c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0091:  nop
     IL_0092:  ldc.i4     0x3e8
-    IL_0097:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0097:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_009c:  nop
     IL_009d:  ldloc.2
-    IL_009e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_009e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_00a3:  nop
     IL_00a4:  ldc.i4     0x3e8
-    IL_00a9:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_00a9:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_00ae:  nop
     IL_00af:  ldloc.3
-    IL_00b0:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_00b0:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_00b5:  nop
     IL_00b6:  ldloc.3
-    IL_00b7:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00b7:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00bc:  nop
     IL_00bd:  ldloc.2
-    IL_00be:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00be:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00c3:  nop
     IL_00c4:  ldloc.1
-    IL_00c5:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00c5:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00ca:  nop
     IL_00cb:  ldloc.0
-    IL_00cc:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00cc:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00d1:  nop
     IL_00d2:  ldsfld     int32 A::i
     IL_00d7:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj
index 0ed96ea478..03f8f16882 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj
index 516157a1e1..34e181bf57 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
index e3bf0905b1..2d65b10424 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
@@ -44,8 +44,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 B::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -63,8 +63,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -94,8 +94,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -113,8 +113,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -144,8 +144,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 D::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -163,8 +163,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -194,8 +194,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 E::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -213,8 +213,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -244,8 +244,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -263,8 +263,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -321,65 +321,65 @@
     .entrypoint
     // Code size       244 (0xf4)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
              bool V_4)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetE()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldloc.0
-    IL_005c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_005c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0061:  nop
     IL_0062:  ldc.i4     0x3e8
-    IL_0067:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0067:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_006c:  nop
     IL_006d:  ldloc.1
-    IL_006e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_006e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0073:  nop
     IL_0074:  ldc.i4     0x3e8
-    IL_0079:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0079:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_007e:  nop
     IL_007f:  ldloc.2
-    IL_0080:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0080:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0085:  nop
     IL_0086:  ldloc.2
-    IL_0087:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0087:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_008c:  nop
     IL_008d:  ldloc.1
-    IL_008e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_008e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0093:  nop
     IL_0094:  ldloc.0
-    IL_0095:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0095:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_009a:  nop
     IL_009b:  ldsfld     int32 A::i
     IL_00a0:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj
index a4173dec6a..22ca80d90e 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj
index e1833639f2..485d8e2ed4 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
index 5c75d8ff5c..73f1125d96 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
@@ -44,11 +44,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 B::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -66,8 +66,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -97,8 +97,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -116,8 +116,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -147,8 +147,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 D::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -166,8 +166,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -197,8 +197,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 E::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -216,8 +216,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -247,8 +247,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -266,8 +266,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -324,65 +324,65 @@
     .entrypoint
     // Code size       244 (0xf4)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
              bool V_4)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetE()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldloc.0
-    IL_005c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_005c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0061:  nop
     IL_0062:  ldc.i4     0x3e8
-    IL_0067:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0067:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_006c:  nop
     IL_006d:  ldloc.1
-    IL_006e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_006e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0073:  nop
     IL_0074:  ldc.i4     0x3e8
-    IL_0079:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0079:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_007e:  nop
     IL_007f:  ldloc.2
-    IL_0080:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0080:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0085:  nop
     IL_0086:  ldloc.2
-    IL_0087:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0087:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_008c:  nop
     IL_008d:  ldloc.1
-    IL_008e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_008e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0093:  nop
     IL_0094:  ldloc.0
-    IL_0095:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0095:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_009a:  nop
     IL_009b:  ldsfld     int32 A::i
     IL_00a0:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj
index 2f5fa4ef4a..7790cff36c 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj
index 3aed42082e..720ade18e1 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
index 51d9a3bbe7..1a895424a6 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
@@ -44,11 +44,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 B::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -66,8 +66,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -97,8 +97,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -116,8 +116,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -147,11 +147,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 D::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -169,8 +169,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -200,8 +200,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 E::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -219,8 +219,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -250,8 +250,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -269,8 +269,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -327,65 +327,65 @@
     .entrypoint
     // Code size       244 (0xf4)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
              bool V_4)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetE()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldloc.0
-    IL_005c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_005c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0061:  nop
     IL_0062:  ldc.i4     0x3e8
-    IL_0067:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0067:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_006c:  nop
     IL_006d:  ldloc.1
-    IL_006e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_006e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0073:  nop
     IL_0074:  ldc.i4     0x3e8
-    IL_0079:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0079:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_007e:  nop
     IL_007f:  ldloc.2
-    IL_0080:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0080:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0085:  nop
     IL_0086:  ldloc.2
-    IL_0087:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0087:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_008c:  nop
     IL_008d:  ldloc.1
-    IL_008e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_008e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0093:  nop
     IL_0094:  ldloc.0
-    IL_0095:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0095:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_009a:  nop
     IL_009b:  ldsfld     int32 A::i
     IL_00a0:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj
index 130a046d52..bbf176cd85 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>