Skip to content

Fix System.Runtime reference versions and several test project names under JIT/Methodical #64839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trylek merged 5 commits into from
Feb 8, 2022
Merged

Fix System.Runtime reference versions and several test project names under JIT/Methodical #64839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef58a7a
Fix System.Runtime reference public key token in delegatetail.il
trylek Jan 5, 2022
6325cc2
Three more IL sources needing explicit System.Runtime PKT
trylek Feb 2, 2022
3ab4df0
Clean up several project file names
trylek Feb 2, 2022
1018713
Typo
trylek Feb 2, 2022
0a0a35a
Fix assembly name for sin_cs_il* tests
trylek Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
0 ...ethodical/Boxing/xlang/sin_cs_cs_d.csproj → ...al/Boxing/xlang/sin_cs_cs_sinlib_d.csproj
View file
Open in desktop
File renamed without changes.
0 ...thodical/Boxing/xlang/sin_cs_cs_do.csproj → ...l/Boxing/xlang/sin_cs_cs_sinlib_do.csproj
View file
Open in desktop
File renamed without changes.
0 ...ethodical/Boxing/xlang/sin_cs_cs_r.csproj → ...al/Boxing/xlang/sin_cs_cs_sinlib_r.csproj
View file
Open in desktop
File renamed without changes.
0 ...thodical/Boxing/xlang/sin_cs_cs_ro.csproj → ...l/Boxing/xlang/sin_cs_cs_sinlib_ro.csproj
View file
Open in desktop
File renamed without changes.
0 ...ethodical/Boxing/xlang/sin_cs_il_d.csproj → ...al/Boxing/xlang/sin_cs_il_sinlib_d.csproj
View file
Open in desktop
File renamed without changes.
0 ...thodical/Boxing/xlang/sin_cs_il_do.csproj → ...l/Boxing/xlang/sin_cs_il_sinlib_do.csproj
View file
Open in desktop
File renamed without changes.
0 ...ethodical/Boxing/xlang/sin_cs_il_r.csproj → ...al/Boxing/xlang/sin_cs_il_sinlib_r.csproj
View file
Open in desktop
File renamed without changes.
0 ...thodical/Boxing/xlang/sin_cs_il_ro.csproj → ...l/Boxing/xlang/sin_cs_il_sinlib_ro.csproj
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
0 ...wgraph/bug619534/twoEndFinallys_il.ilproj → ...raph/bug619534/twoEndFinallys_il_r.ilproj
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/int64/misc/longmul.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
12 changes: 2 additions & 10 deletions src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/Methodical/xxblk/dynblk_order.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
0 ...IT/Methodical/xxblk/dynblk_order_d.ilproj → ...Methodical/xxblk/dynblk_order_il_d.ilproj
View file
Open in desktop
File renamed without changes.
0 ...T/Methodical/xxblk/dynblk_order_ro.ilproj → ...Methodical/xxblk/dynblk_order_il_r.ilproj
View file
Open in desktop
File renamed without changes.