Add System.Console references and replace usages with [System.Console]

4 files changed, 55 insertions, 34 deletions

diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1.il b/tests/src/JIT/Generics/ConstrainedCall/vt1.il
index 149938c7a3..cc79d9402e 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1.il
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1.il
@@ -5,7 +5,12 @@
 // ldflda, ldelema, ldarga
 // Increment: constrained, Decrement: box
 
-.assembly extern mscorlib {}
+.assembly extern mscorlib { }
+.assembly extern System.Console
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
 .assembly vt1 {}
 .class interface private abstract auto ansi IncrDecr
 {
@@ -243,12 +248,12 @@
     IL_0014:  beq.s      IL_003c
 
     IL_0016:  ldstr      "FAILED"
-    IL_001b:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_001b:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0020:  ldstr      "Expected: 100, Actual: {0}"
     IL_0025:  ldloc.0
     IL_0026:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val()
     IL_002b:  box        [mscorlib]System.Int32
-    IL_0030:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_0030:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0035:  ldc.i4.1
     IL_0036:  stloc.2
@@ -262,12 +267,12 @@
     IL_004a:  beq.s      IL_0072
 
     IL_004c:  ldstr      "FAILED"
-    IL_0051:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_0051:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0056:  ldstr      "Expected: 100, Actual: {0}"
     IL_005b:  ldloc.0
     IL_005c:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val()
     IL_0061:  box        [mscorlib]System.Int32
-    IL_0066:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_0066:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_006b:  ldc.i4.2
     IL_006c:  stloc.2
@@ -283,13 +288,13 @@
     IL_0082:  beq.s      IL_00ab
 
     IL_0084:  ldstr      "FAILED"
-    IL_0089:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_0089:  call       void [System.Console]System.Console::WriteLine(string)
     IL_008e:  ldstr      "Expected: 100, Actual: {0}"
     IL_0093:  ldloc.0
     IL_0094:  ldc.i4.0
     IL_0095:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val(int32)
     IL_009a:  box        [mscorlib]System.Int32
-    IL_009f:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_009f:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_00a4:  ldc.i4.3
     IL_00a5:  stloc.2
@@ -305,13 +310,13 @@
     IL_00bb:  beq.s      IL_00e4
 
     IL_00bd:  ldstr      "FAILED"
-    IL_00c2:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_00c2:  call       void [System.Console]System.Console::WriteLine(string)
     IL_00c7:  ldstr      "Expected: 100, Actual: {0}"
   IL_00cc:  ldloc.0
   IL_00cd:  ldc.i4.0
   IL_00ce:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val(int32)
   IL_00d3:  box        [mscorlib]System.Int32
-  IL_00d8:  call       void [mscorlib]System.Console::WriteLine(string,
+  IL_00d8:  call       void [System.Console]System.Console::WriteLine(string,
                                                                 object)
   IL_00dd:  ldc.i4.4
   IL_00de:  stloc.2
@@ -326,12 +331,12 @@
   IL_00f9:  ldc.i4     100
   IL_00fe:  beq.s      IL_0123
   IL_0100:  ldstr      "FAILED"
-  IL_0105:  call       void [mscorlib]System.Console::WriteLine(string)
+  IL_0105:  call       void [System.Console]System.Console::WriteLine(string)
   IL_010a:  ldstr      "Expected: 100, Actual: {0}"
   IL_010f:  ldloc.0
   IL_0110:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val()
   IL_0115:  box        [mscorlib]System.Int32
-  IL_011a:  call       void [mscorlib]System.Console::WriteLine(string,
+  IL_011a:  call       void [System.Console]System.Console::WriteLine(string,
                                                                 object)
   IL_011f:  ldc.i4.5
   IL_0120:  stloc.2
@@ -344,18 +349,18 @@
   IL_0130:  ldc.i4     0
   IL_0135:  beq.s      IL_015a
   IL_0137:  ldstr      "FAILED"
-  IL_013c:  call       void [mscorlib]System.Console::WriteLine(string)
+  IL_013c:  call       void [System.Console]System.Console::WriteLine(string)
   IL_0141:  ldstr      "Expected: 100, Actual: {0}"
   IL_0146:  ldloc.0
   IL_0147:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val()
   IL_014c:  box        [mscorlib]System.Int32
-  IL_0151:  call       void [mscorlib]System.Console::WriteLine(string,
+  IL_0151:  call       void [System.Console]System.Console::WriteLine(string,
                                                                 object)
   IL_0156:  ldc.i4.6
   IL_0157:  stloc.2
   IL_0158:  br.s       IL_0169
   IL_015a:  ldstr      "PASSED"
-  IL_015f:  call       void [mscorlib]System.Console::WriteLine(string)
+  IL_015f:  call       void [System.Console]System.Console::WriteLine(string)
   IL_0164:  ldc.i4.s   100
   IL_0166:  stloc.2
   IL_0167:  br.s       IL_0169
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2.il b/tests/src/JIT/Generics/ConstrainedCall/vt2.il
index 660dc768b9..30fc9994f0 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2.il
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2.il
@@ -5,7 +5,12 @@
 // ldflda, ldelema, ldarga
 // Val*A: constrained, Val*B: box
 
-.assembly extern mscorlib {}
+.assembly extern mscorlib { }
+.assembly extern System.Console
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
 .assembly vt2 {}
 .class interface private abstract auto ansi IncrDecr
 {
@@ -194,7 +199,7 @@
     IL_0012:  beq.s      IL_0045
 
     IL_0014:  ldstr      "FAILED"
-    IL_0019:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_0019:  call       void [System.Console]System.Console::WriteLine(string)
     IL_001e:  ldstr      "mc.Val1A()={0}, mc.Val1B()={0}"
     IL_0023:  ldloc.0
     IL_0024:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val1A()
@@ -202,7 +207,7 @@
     IL_002e:  ldloc.0
     IL_002f:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val1B()
     IL_0034:  box        [mscorlib]System.Int32
-    IL_0039:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_0039:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object,
                                                                   object)
     IL_003e:  ldc.i4.1
@@ -216,7 +221,7 @@
     IL_0051:  beq.s      IL_0081
 
     IL_0053:  ldstr      "FAILED"
-    IL_0058:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_0058:  call       void [System.Console]System.Console::WriteLine(string)
     IL_005d:  ldstr      "mc.Val1A()={0}, mc.Val1B()={0}"
     IL_0062:  ldloc.0
     IL_0063:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val2A()
@@ -224,7 +229,7 @@
     IL_006d:  ldloc.0
     IL_006e:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val2B()
     IL_0073:  box        [mscorlib]System.Int32
-    IL_0078:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_0078:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object,
                                                                   object)
     IL_007d:  ldc.i4.2
@@ -242,7 +247,7 @@
     IL_0097:  beq.s      IL_00c9
 
     IL_0099:  ldstr      "FAILED"
-    IL_009e:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_009e:  call       void [System.Console]System.Console::WriteLine(string)
     IL_00a3:  ldstr      "mc.Val1A()={0}, mc.Val1B()={0}"
     IL_00a8:  ldloc.0
     IL_00a9:  ldloc.1
@@ -252,7 +257,7 @@
     IL_00b5:  ldloc.1
     IL_00b6:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val3B(!0)
     IL_00bb:  box        [mscorlib]System.Int32
-    IL_00c0:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_00c0:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object,
                                                                   object)
     IL_00c5:  ldc.i4.3
@@ -260,7 +265,7 @@
     IL_00c7:  br.s       IL_00d8
 
     IL_00c9:  ldstr      "PASSED"
-    IL_00ce:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_00ce:  call       void [System.Console]System.Console::WriteLine(string)
     IL_00d3:  ldc.i4.s   100
     IL_00d5:  stloc.2
     IL_00d6:  br.s       IL_00d8
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3.il b/tests/src/JIT/Generics/ConstrainedCall/vt3.il
index 57c76975af..62026067e6 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3.il
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3.il
@@ -5,7 +5,12 @@
 // ldflda, ldelema, ldarga
 // Val*A: constrained, Val*B: box
 
-.assembly extern mscorlib {}
+.assembly extern mscorlib { }
+.assembly extern System.Console
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
 .assembly vt3 {}
 .class interface private abstract auto ansi IncrDecr
 {
@@ -211,7 +216,7 @@
     IL_0012:  beq.s      IL_0045
 
     IL_0014:  ldstr      "FAILED"
-    IL_0019:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_0019:  call       void [System.Console]System.Console::WriteLine(string)
     IL_001e:  ldstr      "mc.Val1A()={0}, mc.Val1B()={0}"
     IL_0023:  ldloc.0
     IL_0024:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val1A()
@@ -219,7 +224,7 @@
     IL_002e:  ldloc.0
     IL_002f:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val1B()
     IL_0034:  box        [mscorlib]System.Int32
-    IL_0039:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_0039:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object,
                                                                   object)
     IL_003e:  ldc.i4.1
@@ -233,7 +238,7 @@
     IL_0051:  beq.s      IL_0081
 
     IL_0053:  ldstr      "FAILED"
-    IL_0058:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_0058:  call       void [System.Console]System.Console::WriteLine(string)
     IL_005d:  ldstr      "mc.Val1A()={0}, mc.Val1B()={0}"
     IL_0062:  ldloc.0
     IL_0063:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val2A()
@@ -241,7 +246,7 @@
     IL_006d:  ldloc.0
     IL_006e:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val2B()
     IL_0073:  box        [mscorlib]System.Int32
-    IL_0078:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_0078:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object,
                                                                   object)
     IL_007d:  ldc.i4.2
@@ -259,7 +264,7 @@
     IL_0097:  beq.s      IL_00c9
 
     IL_0099:  ldstr      "FAILED"
-    IL_009e:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_009e:  call       void [System.Console]System.Console::WriteLine(string)
     IL_00a3:  ldstr      "mc.Val1A()={0}, mc.Val1B()={0}"
     IL_00a8:  ldloc.0
     IL_00a9:  ldloc.1
@@ -269,7 +274,7 @@
     IL_00b5:  ldloc.1
     IL_00b6:  callvirt   instance int32 class MyCounter<valuetype MyInt>::Val3B(!0)
     IL_00bb:  box        [mscorlib]System.Int32
-    IL_00c0:  call       void [mscorlib]System.Console::WriteLine(string,
+    IL_00c0:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object,
                                                                   object)
     IL_00c5:  ldc.i4.3
@@ -277,7 +282,7 @@
     IL_00c7:  br.s       IL_00d8
 
     IL_00c9:  ldstr      "PASSED"
-    IL_00ce:  call       void [mscorlib]System.Console::WriteLine(string)
+    IL_00ce:  call       void [System.Console]System.Console::WriteLine(string)
     IL_00d3:  ldc.i4.s   100
     IL_00d5:  stloc.2
     IL_00d6:  br.s       IL_00d8
diff --git a/tests/src/JIT/Generics/regression/DDB148379/ddb148379.il b/tests/src/JIT/Generics/regression/DDB148379/ddb148379.il
index f0f1dfa862..4cf8f03239 100644
--- a/tests/src/JIT/Generics/regression/DDB148379/ddb148379.il
+++ b/tests/src/JIT/Generics/regression/DDB148379/ddb148379.il
@@ -1,6 +1,12 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+.assembly extern System.Console
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
+
 
 
 
@@ -54,7 +60,7 @@
     IL_0000:  ldtoken    class [mscorlib]System.Collections.Generic.Dictionary`2<!T,!!U>
     IL_0005:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(valuetype [mscorlib]System.RuntimeTypeHandle)
               dup
-    IL_000a:  call       void [mscorlib]System.Console::WriteLine(object)
+    IL_000a:  call       void [System.Console]System.Console::WriteLine(object)
               callvirt   instance string [mscorlib]System.Object::ToString()
               ldstr  "System.Collections.Generic.Dictionary`2[System.String,System.Object]"
               call       bool [mscorlib]System.String::op_Inequality(string,
@@ -62,7 +68,7 @@
               ldc.i4.0
               beq        IL_000f
               ldstr "FAIL"
-              call void [mscorlib]System.Console::WriteLine(string)
+              call void [System.Console]System.Console::WriteLine(string)
               ldc.i4 99
               ret
     IL_000f:  ldc.i4 100
@@ -85,7 +91,7 @@
     IL_0000:  ldtoken    class [mscorlib]System.Collections.Generic.Dictionary`2<!!U,!T>
     IL_0005:  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(valuetype [mscorlib]System.RuntimeTypeHandle)
               dup
-    IL_000a:  call       void [mscorlib]System.Console::WriteLine(object)
+    IL_000a:  call       void [System.Console]System.Console::WriteLine(object)
               callvirt   instance string [mscorlib]System.Object::ToString()
               ldstr  "System.Collections.Generic.Dictionary`2[System.Object,System.String]"
               call       bool [mscorlib]System.String::op_Inequality(string,
@@ -93,7 +99,7 @@
               ldc.i4.0
               beq        IL_000f
               ldstr "FAIL"
-              call void [mscorlib]System.Console::WriteLine(string)
+              call void [System.Console]System.Console::WriteLine(string)
               ldc.i4 99
               ret