Fix System.Runtime reference versions and several test project names …

…under JIT/Methodical (#64839) * Fix System.Runtime reference public key token in delegatetail.il * Three more IL sources needing explicit System.Runtime PKT * Clean up several project file names * Typo * Fix assembly name for sin_cs_il* tests
dotnet · Feb 8, 2022 · 205f70e · 205f70e
1 parent 570b8e2
commit 205f70e
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 14 deletions.
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib { auto }
-.assembly 'sin_cs' {}
+.assembly 'sin_il_cs' {}
 .assembly extern xunit.core {}
 .assembly extern sinlib_cs
 {

diff --git a/...ethodical/Boxing/xlang/sin_cs_cs_d.csproj → ...al/Boxing/xlang/sin_cs_cs_sinlib_d.csproj b/...ethodical/Boxing/xlang/sin_cs_cs_d.csproj → ...al/Boxing/xlang/sin_cs_cs_sinlib_d.csproj
diff --git a/...thodical/Boxing/xlang/sin_cs_cs_do.csproj → ...l/Boxing/xlang/sin_cs_cs_sinlib_do.csproj b/...thodical/Boxing/xlang/sin_cs_cs_do.csproj → ...l/Boxing/xlang/sin_cs_cs_sinlib_do.csproj
diff --git a/...ethodical/Boxing/xlang/sin_cs_cs_r.csproj → ...al/Boxing/xlang/sin_cs_cs_sinlib_r.csproj b/...ethodical/Boxing/xlang/sin_cs_cs_r.csproj → ...al/Boxing/xlang/sin_cs_cs_sinlib_r.csproj
diff --git a/...thodical/Boxing/xlang/sin_cs_cs_ro.csproj → ...l/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj b/...thodical/Boxing/xlang/sin_cs_cs_ro.csproj → ...l/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj
diff --git a/...ethodical/Boxing/xlang/sin_cs_il_d.csproj → ...al/Boxing/xlang/sin_cs_il_sinlib_d.csproj b/...ethodical/Boxing/xlang/sin_cs_il_d.csproj → ...al/Boxing/xlang/sin_cs_il_sinlib_d.csproj
diff --git a/...thodical/Boxing/xlang/sin_cs_il_do.csproj → ...l/Boxing/xlang/sin_cs_il_sinlib_do.csproj b/...thodical/Boxing/xlang/sin_cs_il_do.csproj → ...l/Boxing/xlang/sin_cs_il_sinlib_do.csproj
diff --git a/...ethodical/Boxing/xlang/sin_cs_il_r.csproj → ...al/Boxing/xlang/sin_cs_il_sinlib_r.csproj b/...ethodical/Boxing/xlang/sin_cs_il_r.csproj → ...al/Boxing/xlang/sin_cs_il_sinlib_r.csproj
diff --git a/...thodical/Boxing/xlang/sin_cs_il_ro.csproj → ...l/Boxing/xlang/sin_cs_il_sinlib_ro.csproj b/...thodical/Boxing/xlang/sin_cs_il_ro.csproj → ...l/Boxing/xlang/sin_cs_il_sinlib_ro.csproj
diff --git a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern System.Console { auto }
-.assembly extern System.Runtime { auto }
+.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 
 .assembly 'copy_prop_byref_to_native_int' { }
 .assembly extern xunit.core {}

diff --git a/...wgraph/bug619534/twoEndFinallys_il.ilproj → ...raph/bug619534/twoEndFinallys_il_r.ilproj b/...wgraph/bug619534/twoEndFinallys_il.ilproj → ...raph/bug619534/twoEndFinallys_il_r.ilproj
diff --git a/src/tests/JIT/Methodical/int64/misc/longmul.il b/src/tests/JIT/Methodical/int64/misc/longmul.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern System.Console { auto }
-.assembly extern System.Runtime { auto }
+.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 .assembly 'longmul' { }
 .assembly extern xunit.core {}
 

diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
@@ -3,16 +3,8 @@
 
 
 
-.assembly extern mscorlib
-{
-  .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
-  .ver 4:0:0:0
-}
-.assembly extern System.Runtime
-{
-  .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
-  .ver 4:0:0:0
-}
+.assembly extern mscorlib { auto }
+.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 .assembly 'delegateTail'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 

diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order.il b/src/tests/JIT/Methodical/xxblk/dynblk_order.il
@@ -3,7 +3,7 @@
 
 // Tests that cpblk/initblk importation sastifies ordering constraints.
 
-.assembly extern System.Runtime { }
+.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 

diff --git a/...IT/Methodical/xxblk/dynblk_order_d.ilproj → ...Methodical/xxblk/dynblk_order_il_d.ilproj b/...IT/Methodical/xxblk/dynblk_order_d.ilproj → ...Methodical/xxblk/dynblk_order_il_d.ilproj
diff --git a/...T/Methodical/xxblk/dynblk_order_ro.ilproj → ...Methodical/xxblk/dynblk_order_il_r.ilproj b/...T/Methodical/xxblk/dynblk_order_ro.ilproj → ...Methodical/xxblk/dynblk_order_il_r.ilproj