From bc822868822f0206a1fa1f01c61f9b2d78bc9ac0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tom=C3=A1=C5=A1=20Rylek?= Date: Tue, 8 Mar 2022 02:22:08 +0100 Subject: [PATCH] Fix ConditionalFactAttribute instances in ILPROJ tests (#66312) I have found out that the change I originally made by changing reference assembly for System.Type from System.Runtime to mscorlib was incorrect - the Roslyn XUnit wrapper source generator started failing with a nullref. I have experimentally identified that I can fix this problem by explicitly specifying public key tokens of the System.Runtime and Microsoft.DotNet.XUnitExtensions assembly references and by adding a reference to the TestLibrary. As I had to update System.Runtime references in all affected modules, I also put back the System.Runtime assembly as the home for System.Type as was the original state I copied from a C# compilation disassembly, I changed them to mscorlib because I didn't know I would need to specify the System.Runtime reference. Thanks Tomas --- .../JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il | 6 ++++-- .../JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il | 6 ++++-- src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il | 6 ++++-- src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il | 6 ++++-- .../JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il | 6 ++++-- .../JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il | 6 ++++-- src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il | 6 ++++-- .../JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il | 6 ++++-- src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il | 6 ++++-- .../JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il | 6 ++++-- src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il | 6 ++++-- .../JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il | 6 ++++-- 12 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il index c6bbc00..5a2f5c3 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT.il @@ -6,19 +6,21 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern mscorlib { } .assembly 'i_array_merge_Target_32BIT' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .class public auto ansi Test_i_array_merge_Target_32BIT extends [mscorlib]System.Object { .method private hidebysig static int32 Main() il managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il index a0beb2b..d53448f 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT.il @@ -6,19 +6,21 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern mscorlib { } .assembly 'i_array_merge_Target_64BIT' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .class public auto ansi Test_i_array_merge_Target_64BIT extends [mscorlib]System.Object { .method private hidebysig static int32 Main() il managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is64BitProcess))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il index 8683425..10f05df 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT.il @@ -13,11 +13,13 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'sizeof_Target_32BIT'// as "avg" { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535} .namespace AvgTest { @@ -27,7 +29,7 @@ .method private hidebysig static int32 Main() il managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il index 4e9e85e..fe96ed6 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT.il @@ -13,11 +13,13 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'sizeof_Target_64BIT'// as "avg" { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535} .namespace AvgTest_sizeof_Target_64BIT { @@ -27,7 +29,7 @@ .method private hidebysig static int32 Main() il managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is64BitProcess))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il index e5f16d6..f48e22a 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT.il @@ -6,19 +6,21 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern mscorlib { } .assembly 'u_array_merge_Target_32BIT' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .class public auto ansi Test_u_array_merge_Target_32BIT extends [mscorlib]System.Object { .method private hidebysig static int32 Main() il managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il index 30bdaec..cff14a3 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT.il @@ -6,19 +6,21 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern mscorlib { } .assembly 'u_array_merge_Target_64BIT' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .class public auto ansi Test_u_array_merge_Target_64BIT extends [mscorlib]System.Object { .method private hidebysig static int32 Main() il managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is64BitProcess))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il index 8ef8a43..4d12bbe 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86.il @@ -3,9 +3,11 @@ // sizeof32.il .assembly extern mscorlib { } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly sizeof32_Target_32Bit_x86 { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) .namespace JitTest_sizeof32_Target_32Bit_x86_il { @@ -38,7 +40,7 @@ Main() cil managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsX86Process))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il index fc257ed..a217a36 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm.il @@ -2,9 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern mscorlib { } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'sizeof32_Target_64Bit_and_arm' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) .namespace JitTest_sizeof32_Target_64Bit_and_arm_il { @@ -37,7 +39,7 @@ Main() cil managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsNotX86Process))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il index 5e6d73b..ef28ecd 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86.il @@ -3,9 +3,11 @@ // sizeof64.il .assembly extern mscorlib { } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly sizeof64_Target_32Bit_x86 { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) .namespace JitTest_sizeof64_Target_32Bit_x86_il { @@ -39,7 +41,7 @@ Main() cil managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsX86Process))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il index 1bb9c80..97e244c 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm.il @@ -2,9 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. .assembly extern mscorlib { } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly 'sizeof64_Target_64Bit_and_arm' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) .namespace JitTest_sizeof64_Target_64Bit_and_arm_il { @@ -38,7 +40,7 @@ Main() cil managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsNotX86Process))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il index 465babb..f78812e 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86.il @@ -6,13 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern mscorlib { } .assembly 'sizeof_Target_32Bit_x86' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) .namespace JitTest_sizeof_Target_32Bit_x86_il { @@ -80,7 +82,7 @@ Main() cil managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsX86Process))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il index 7ed6d01..80c67c7 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm.il @@ -6,13 +6,15 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } .assembly extern mscorlib { } .assembly 'sizeof_Target_64Bit_and_arm' { } .assembly extern xunit.core {} -.assembly extern Microsoft.DotNet.XUnitExtensions {} +.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) } +.assembly extern TestLibrary {} .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) .namespace JitTest_sizeof_Target_64Bit_and_arm_il { @@ -80,7 +82,7 @@ Main() cil managed { // [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsNotX86Process))] - .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [mscorlib]System.Type, + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) = ( 01 00 61 54 65 73 74 4C 69 62 72 61 72 79 2E 50 // ..aTestLibrary.P 6C 61 74 66 6F 72 6D 44 65 74 65 63 74 69 6F 6E // latformDetection 2C 20 54 65 73 74 4C 69 62 72 61 72 79 2C 20 56 // , TestLibrary, V -- 2.7.4