diff --git a/src/tests/Directory.Merged.props b/src/tests/Directory.Merged.props
index a0a84e7b29537..ea43b155669e8 100644
--- a/src/tests/Directory.Merged.props
+++ b/src/tests/Directory.Merged.props
@@ -2,32 +2,5 @@
true
false
-
-
-
- $(MSBuildProjectName.Replace('_il_do', '').Replace('_il_d', '').Replace('_il_ro', '').Replace('_il_r', ''))
diff --git a/src/tests/JIT/Directed/Directed_1.csproj b/src/tests/JIT/Directed/Directed_1.csproj
index 162981e81d74a..66ec17b4004a6 100644
--- a/src/tests/JIT/Directed/Directed_1.csproj
+++ b/src/tests/JIT/Directed/Directed_1.csproj
@@ -1,13 +1,7 @@
-
-
-
-
-
-
-
-
+
+
diff --git a/src/tests/JIT/Directed/Directed_2.csproj b/src/tests/JIT/Directed/Directed_2.csproj
index 1283dc887da9f..3ac99ccb9e724 100644
--- a/src/tests/JIT/Directed/Directed_2.csproj
+++ b/src/tests/JIT/Directed/Directed_2.csproj
@@ -1,12 +1,9 @@
+
+
-
-
-
-
-
-
+
diff --git a/src/tests/JIT/Directed/Directed_3.csproj b/src/tests/JIT/Directed/Directed_3.csproj
new file mode 100644
index 0000000000000..45060cbcc5c87
--- /dev/null
+++ b/src/tests/JIT/Directed/Directed_3.csproj
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/Directed_cs_r.csproj b/src/tests/JIT/Directed/Directed_cs_r.csproj
deleted file mode 100644
index ef6a9dc243782..0000000000000
--- a/src/tests/JIT/Directed/Directed_cs_r.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/Directed_cs_ro.csproj b/src/tests/JIT/Directed/Directed_cs_ro.csproj
deleted file mode 100644
index e8a582013ee3f..0000000000000
--- a/src/tests/JIT/Directed/Directed_cs_ro.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/Directed_d.csproj b/src/tests/JIT/Directed/Directed_d.csproj
deleted file mode 100644
index 9137c936b6b3e..0000000000000
--- a/src/tests/JIT/Directed/Directed_d.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/Directed_do.csproj b/src/tests/JIT/Directed/Directed_do.csproj
deleted file mode 100644
index 87aa58202d18c..0000000000000
--- a/src/tests/JIT/Directed/Directed_do.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/Directed_r.csproj b/src/tests/JIT/Directed/Directed_r.csproj
deleted file mode 100644
index b68cb8478ab2a..0000000000000
--- a/src/tests/JIT/Directed/Directed_r.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/Directed_ro.csproj b/src/tests/JIT/Directed/Directed_ro.csproj
deleted file mode 100644
index 4b0cfad60a365..0000000000000
--- a/src/tests/JIT/Directed/Directed_ro.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3.il b/src/tests/JIT/Directed/UnrollLoop/loop3.il
index 38a11bb2ff1da..c0924a497a1f3 100644
--- a/src/tests/JIT/Directed/UnrollLoop/loop3.il
+++ b/src/tests/JIT/Directed/UnrollLoop/loop3.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'loop3' {}
+.assembly ASSEMBLY_NAME {}
.class private auto ansi beforefieldinit A
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_d.il b/src/tests/JIT/Directed/UnrollLoop/loop3_d.il
new file mode 100644
index 0000000000000..b33a999a7a0d2
--- /dev/null
+++ b/src/tests/JIT/Directed/UnrollLoop/loop3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "loop3_d"
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_d.ilproj b/src/tests/JIT/Directed/UnrollLoop/loop3_d.ilproj
new file mode 100644
index 0000000000000..a271147c9828f
--- /dev/null
+++ b/src/tests/JIT/Directed/UnrollLoop/loop3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj b/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
deleted file mode 100644
index 10b22dd22d59e..0000000000000
--- a/src/tests/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj b/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
deleted file mode 100644
index 6b39bbacbfb35..0000000000000
--- a/src/tests/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_r.il b/src/tests/JIT/Directed/UnrollLoop/loop3_r.il
new file mode 100644
index 0000000000000..284dee692e886
--- /dev/null
+++ b/src/tests/JIT/Directed/UnrollLoop/loop3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "loop3_r"
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3_r.ilproj b/src/tests/JIT/Directed/UnrollLoop/loop3_r.ilproj
new file mode 100644
index 0000000000000..7e0a87958f1fd
--- /dev/null
+++ b/src/tests/JIT/Directed/UnrollLoop/loop3_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il
index d226111edb810..a0e9602aa8f7f 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally.il
@@ -1,6 +1,6 @@
.assembly extern mscorlib {}
.assembly extern xunit.core {}
-.assembly badendfinally { }
+.assembly ASSEMBLY_NAME { }
.method public static int32 f() noinlining
{
endfinally
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_d.il
new file mode 100644
index 0000000000000..8d8fa60ed54b7
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badendfinally_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_d.ilproj
new file mode 100644
index 0000000000000..5676be9bcb288
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
deleted file mode 100644
index 2382dd1a26473..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
deleted file mode 100644
index 2abab0330ab0b..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_r.il
new file mode 100644
index 0000000000000..c2a579844ca55
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badendfinally_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_r.ilproj
new file mode 100644
index 0000000000000..0defb6c3a334f
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badendfinally_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
index ac13045b0b147..d1294a97bf1a1 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
@@ -3,7 +3,7 @@
.assembly extern mscorlib {}
.assembly extern xunit.core {}
-.assembly 'badldsfld' { }
+.assembly ASSEMBLY_NAME { }
.class public Test_badldsfld extends [mscorlib]System.Object
{
.field int32 i
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_d.il
new file mode 100644
index 0000000000000..bfb43cbf23ba6
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badldsfld_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_d.ilproj
new file mode 100644
index 0000000000000..543942c75967d
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
deleted file mode 100644
index 48b2d127f48c7..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
deleted file mode 100644
index 39c1b0d0fcfa1..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_r.il
new file mode 100644
index 0000000000000..1b36e72bdaf79
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badldsfld_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_r.ilproj
new file mode 100644
index 0000000000000..ddf6cc5fe9d55
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il
index f5c711268ff9a..103017a76b20b 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall.il
@@ -1,6 +1,6 @@
.assembly extern mscorlib {}
.assembly extern xunit.core {}
-.assembly badtailcall { }
+.assembly ASSEMBLY_NAME { }
.method public static int32 f()
{
ldc.i4 100
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_d.il
new file mode 100644
index 0000000000000..952c03424d557
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badtailcall_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_d.ilproj
new file mode 100644
index 0000000000000..361ca8a191db8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
deleted file mode 100644
index 97dc7e3f50c9e..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
deleted file mode 100644
index 6dad7ed0e73f4..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_r.il
new file mode 100644
index 0000000000000..7b39408c621d8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badtailcall_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_r.ilproj
new file mode 100644
index 0000000000000..c0c52dae6afdf
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badtailcall_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il
index ce49493701ab0..67f2d0daab195 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1.il
@@ -12,7 +12,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly byrefsubbyref1 { }
+.assembly ASSEMBLY_NAME { }
.class public a extends [mscorlib]System.Object
{
.field static class ctest S_1
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_d.il
new file mode 100644
index 0000000000000..d989e2811b83c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "byrefsubbyref1_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_d.ilproj
new file mode 100644
index 0000000000000..a682424ab0919
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
deleted file mode 100644
index 37f27b17db25f..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
deleted file mode 100644
index e4e3443528f8b..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_r.il
new file mode 100644
index 0000000000000..6b25f77439092
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "byrefsubbyref1_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_r.ilproj
new file mode 100644
index 0000000000000..98d24a3069345
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il
index 97637457258c3..3ed919b229846 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2.il
@@ -1,6 +1,6 @@
.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
-.assembly legacy library calli2 { }
+.assembly legacy library ASSEMBLY_NAME { }
.class public auto ansi beforefieldinit calli2
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_d.il
new file mode 100644
index 0000000000000..e408f3c746307
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "calli2_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_d.ilproj
new file mode 100644
index 0000000000000..9811e5e5f728c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
deleted file mode 100644
index 0bec008c6482e..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
deleted file mode 100644
index d3d3202c5d5d3..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_r.il
new file mode 100644
index 0000000000000..93bad96d15322
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "calli2_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_r.ilproj
new file mode 100644
index 0000000000000..ef21bef650a23
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/calli2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il
index ec0b1d17b60b9..493ce68e1639b 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal.il
@@ -9,7 +9,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly ceeillegal { }
+.assembly ASSEMBLY_NAME { }
.method public static void f()
{
.emitbyte 0xee
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_d.il
new file mode 100644
index 0000000000000..0906c508a8ecd
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ceeillegal_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_d.ilproj
new file mode 100644
index 0000000000000..10138655c332d
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
deleted file mode 100644
index a5d7348e4df9a..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
deleted file mode 100644
index 0029b94771594..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_r.il
new file mode 100644
index 0000000000000..c19fcb6bf5a0a
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ceeillegal_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_r.ilproj
new file mode 100644
index 0000000000000..274d7885a0a5f
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ceeillegal_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il
index 811df505fbfc5..c2c7c38dd90c0 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2.il
@@ -10,7 +10,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly legacy library ldelemnullarr2 { }
+.assembly legacy library ASSEMBLY_NAME { }
.class public auto ansi beforefieldinit ldelemnullarr2
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_d.il
new file mode 100644
index 0000000000000..af95c895a7d00
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldelemnullarr2_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_d.ilproj
new file mode 100644
index 0000000000000..453211e6806ea
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
deleted file mode 100644
index 5a88eb78ad828..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
deleted file mode 100644
index 57b15cef85ef8..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_r.il
new file mode 100644
index 0000000000000..454a03b35db2e
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldelemnullarr2_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_r.ilproj
new file mode 100644
index 0000000000000..1258685b7b04b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il
index e4f77232a4590..e08bbe2b25de1 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly legacy library ldfldr4 { }
+.assembly legacy library ASSEMBLY_NAME { }
.class sealed public auto ansi beforefieldinit Test_ldfldr4
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_d.il
new file mode 100644
index 0000000000000..a166ac6ed8068
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldr4_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_d.ilproj
new file mode 100644
index 0000000000000..19547eb73521b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
deleted file mode 100644
index e3adde00b2109..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
deleted file mode 100644
index 51e8d6b262b9e..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_r.il
new file mode 100644
index 0000000000000..6d72bd9752549
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldr4_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_r.ilproj
new file mode 100644
index 0000000000000..106341c680568
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldr4_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il
index 9e38be6e269f8..42487617b2f2e 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1.il
@@ -10,7 +10,7 @@
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly legacy library ldfldstatic1 { }
+.assembly legacy library ASSEMBLY_NAME { }
.class public auto ansi beforefieldinit ldfldstatic1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_d.il
new file mode 100644
index 0000000000000..a2fec2c2fab63
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldstatic1_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_d.ilproj
new file mode 100644
index 0000000000000..e0bb8ebc6bfcc
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
deleted file mode 100644
index 015e493e52d11..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
deleted file mode 100644
index 55b4329d9038e..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_r.il
new file mode 100644
index 0000000000000..d62cc74b64e22
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldstatic1_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_r.ilproj
new file mode 100644
index 0000000000000..76822793a2455
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il
index 5e888e7cfacd9..87667cb056ed4 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly legacy library ldfldunboxedvt { }
+.assembly legacy library ASSEMBLY_NAME { }
.class public sequential ansi sealed beforefieldinit VT
extends [mscorlib]System.ValueType
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_d.il
new file mode 100644
index 0000000000000..dedd61b84eec4
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldunboxedvt_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_d.ilproj
new file mode 100644
index 0000000000000..f889fb6970adf
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
deleted file mode 100644
index 6ea8d59fdc736..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
deleted file mode 100644
index 3f8571a33a303..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_r.il
new file mode 100644
index 0000000000000..f7465c1b355f5
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldunboxedvt_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_r.ilproj
new file mode 100644
index 0000000000000..b38de7bd1d013
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il
index 9e77e2fc868ef..f3b9485642247 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect.il
@@ -1,6 +1,6 @@
.assembly extern mscorlib {}
.assembly extern xunit.core {}
-.assembly ldvirtftnsideeffect { }
+.assembly ASSEMBLY_NAME { }
.method public static class MyTest f(class MyTest)
{
ldarg.0
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_d.il
new file mode 100644
index 0000000000000..93c8b5523a023
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldvirtftnsideeffect_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_d.ilproj
new file mode 100644
index 0000000000000..d3a640a2596c1
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
deleted file mode 100644
index fb24509ed73de..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
deleted file mode 100644
index c0a4ad6b54581..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_r.il
new file mode 100644
index 0000000000000..32c9ad45d6c92
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldvirtftnsideeffect_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_r.ilproj
new file mode 100644
index 0000000000000..fd035b89beebb
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
index fb290f83c6ea6..b8b23e030ffdc 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
@@ -9,7 +9,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly legacy library 'nullsdarr' { }
+.assembly legacy library ASSEMBLY_NAME { }
.class public auto ansi beforefieldinit nullsdarr
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_d.il
new file mode 100644
index 0000000000000..ca8d0f421927b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nullsdarr_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_d.ilproj
new file mode 100644
index 0000000000000..d57d237bfee37
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
deleted file mode 100644
index 5223270db8c25..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
deleted file mode 100644
index 8e80e594e5318..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_r.il
new file mode 100644
index 0000000000000..0165a9d98e409
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nullsdarr_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_r.ilproj
new file mode 100644
index 0000000000000..c9656e4b81b87
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il
index 6c3495d208146..ab8eb48e79ad6 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1.il
@@ -3,7 +3,7 @@
.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
-.assembly refanytype1 { }
+.assembly ASSEMBLY_NAME { }
.method public static int32 f()
{
ldc.i4 100
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_d.il
new file mode 100644
index 0000000000000..18b93b6a84594
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refanytype1_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_d.ilproj
new file mode 100644
index 0000000000000..0df6af77e7ba3
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
deleted file mode 100644
index a638d4ea52be9..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
deleted file mode 100644
index 4ea747e6fd695..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_r.il
new file mode 100644
index 0000000000000..66ca0dba6278e
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refanytype1_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_r.ilproj
new file mode 100644
index 0000000000000..d3a62960e74fe
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/refanytype1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il
index a16f7ce03898a..d8330b44fe915 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly legacy library 'stfldstatic1_Desktop' { }
+.assembly legacy library ASSEMBLY_NAME { }
.class public auto ansi beforefieldinit stfldstatic1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_d.ilproj
new file mode 100644
index 0000000000000..5de3bb55aca6e
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_d.ilproj
deleted file mode 100644
index fc0e0a22b7435..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_r.ilproj
deleted file mode 100644
index c349c9a3efd29..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_r.ilproj
new file mode 100644
index 0000000000000..727123776a360
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_Desktop_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_d.il
new file mode 100644
index 0000000000000..4a731cae62161
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic1_Desktop_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_r.il
new file mode 100644
index 0000000000000..2a1cfec1912ae
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/stfldstatic1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic1_Desktop_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il
index 4e72319324b67..9e2cc0b61f807 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1.il
@@ -4,7 +4,7 @@
.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
-.assembly 'subovfun1_Desktop' { }
+.assembly ASSEMBLY_NAME { }
.method public static uint32 f(uint32 arg)
{
ldarg.0
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_d.ilproj
new file mode 100644
index 0000000000000..6862e55be564a
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_d.ilproj
deleted file mode 100644
index 27db7a435a6b9..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_r.ilproj
deleted file mode 100644
index 788a8819226e1..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_r.ilproj
new file mode 100644
index 0000000000000..469dc4b9a0f29
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_Desktop_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_d.il
new file mode 100644
index 0000000000000..ef3e59dded16d
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "subovfun1_Desktop_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_r.il
new file mode 100644
index 0000000000000..94e851e4daa4d
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/subovfun1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "subovfun1_Desktop_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il
index 2aa185332e6dd..075dd26b65589 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind.il
@@ -1,6 +1,6 @@
.assembly extern mscorlib {}
.assembly extern xunit.core {}
-.assembly volatilldind { }
+.assembly ASSEMBLY_NAME { }
.method public static void f()
{
.locals init (int32* V_0)
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_d.il
new file mode 100644
index 0000000000000..7d17213328fc4
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatilldind_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_d.ilproj
new file mode 100644
index 0000000000000..effbca52efd63
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
deleted file mode 100644
index 3a019a112888c..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
deleted file mode 100644
index 36a72c6a2d72a..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_r.il
new file mode 100644
index 0000000000000..8f4ba8640787b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatilldind_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_r.ilproj
new file mode 100644
index 0000000000000..3f715ac31ba5b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilldind_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il
index b3ad96a67866d..151d1fec4a8a8 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind.il
@@ -1,6 +1,6 @@
.assembly extern mscorlib {}
.assembly extern xunit.core {}
-.assembly volatilstind { }
+.assembly ASSEMBLY_NAME { }
.method public static void f()
{
.locals init (int32* V_0)
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_d.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_d.il
new file mode 100644
index 0000000000000..07549de3d9cf1
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatilstind_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_d.ilproj
new file mode 100644
index 0000000000000..999fd1c5ed7ab
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
deleted file mode 100644
index e7bc3116e7a0a..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
deleted file mode 100644
index 68581b6a5de11..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_r.il b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_r.il
new file mode 100644
index 0000000000000..02eece7e98da8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatilstind_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_r.ilproj b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_r.ilproj
new file mode 100644
index 0000000000000..23aa832f92039
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/volatilstind_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il
index 69eea4da37a72..721db2ee332e6 100644
--- a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il
+++ b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly legacy library 'ldfldstatic1_importer' {}
+.assembly legacy library ldfldstatic1_importer_r {}
.class public auto ansi beforefieldinit ldfldstatic1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_r.ilproj
similarity index 100%
rename from src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_il_r.ilproj
rename to src/tests/JIT/Directed/coverage/importer/ldfldstatic1_importer_r.ilproj
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il b/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il
index 4b85a17068778..15235cbca4fc1 100644
--- a/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il
+++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly legacy library 'stfldstatic1_importer' {}
+.assembly legacy library ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit stfldstatic1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_d.il b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_d.il
new file mode 100644
index 0000000000000..69aaa773fce58
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic1_importer_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_d.ilproj b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_d.ilproj
new file mode 100644
index 0000000000000..6f1704991abf4
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_d.ilproj
deleted file mode 100644
index fec3902875849..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_r.ilproj
deleted file mode 100644
index 5b86402f03485..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_r.ilproj b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_r.ilproj
new file mode 100644
index 0000000000000..8a2c60399b14d
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_importer_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/stfldstatic1_r.il b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_r.il
new file mode 100644
index 0000000000000..1a429504e209a
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/stfldstatic1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic1_importer_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1.il b/src/tests/JIT/Directed/coverage/importer/subovfun1.il
index c3ef04460b562..08d312900a9cb 100644
--- a/src/tests/JIT/Directed/coverage/importer/subovfun1.il
+++ b/src/tests/JIT/Directed/coverage/importer/subovfun1.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly subovfun1 {}
+.assembly ASSEMBLY_NAME {}
.method public static uint32 f(uint32 arg)
{
ldarg.0
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_d.il b/src/tests/JIT/Directed/coverage/importer/subovfun1_d.il
new file mode 100644
index 0000000000000..52d8d39d245ac
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "subovfun1_d"
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_d.ilproj b/src/tests/JIT/Directed/coverage/importer/subovfun1_d.ilproj
new file mode 100644
index 0000000000000..2435fbbbc733c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj b/src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
deleted file mode 100644
index c680fe3906a22..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj b/src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
deleted file mode 100644
index fbc35244f7dec..0000000000000
--- a/src/tests/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_r.il b/src/tests/JIT/Directed/coverage/importer/subovfun1_r.il
new file mode 100644
index 0000000000000..a585e384a2bb3
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "subovfun1_r"
diff --git a/src/tests/JIT/Directed/coverage/importer/subovfun1_r.ilproj b/src/tests/JIT/Directed/coverage/importer/subovfun1_r.ilproj
new file mode 100644
index 0000000000000..4aaa0bf164f48
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/importer/subovfun1_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il
index 950bc1482b6fa..260fa3dc4773d 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly callipinvoke
+.assembly ASSEMBLY_NAME
{
}
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_d.il b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_d.il
new file mode 100644
index 0000000000000..54d2e9b9dec7f
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "callipinvoke_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_d.ilproj
new file mode 100644
index 0000000000000..1b08846826b96
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_d.ilproj
@@ -0,0 +1,15 @@
+
+
+
+ true
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
deleted file mode 100644
index e1d3c6ce0a813..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- true
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
deleted file mode 100644
index 1ce4add3416fc..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- true
-
- true
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_r.il b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_r.il
new file mode 100644
index 0000000000000..f46c021c5269a
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "callipinvoke_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_r.ilproj
new file mode 100644
index 0000000000000..831e375062db7
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_r.ilproj
@@ -0,0 +1,16 @@
+
+
+
+ true
+
+ true
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il
index 60208eb75d8da..bc1f87569546f 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly arrgetlen {}
+.assembly ASSEMBLY_NAME {}
.class private sequential ansi sealed beforefieldinit VT
extends [mscorlib]System.ValueType
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_d.il b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_d.il
new file mode 100644
index 0000000000000..4513452637bf0
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "arrgetlen_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_d.ilproj
new file mode 100644
index 0000000000000..07321f331efbc
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
deleted file mode 100644
index a5104cf92343b..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
deleted file mode 100644
index 5e474712538e0..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_r.il b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_r.il
new file mode 100644
index 0000000000000..0c1fc41432ab8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "arrgetlen_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_r.ilproj
new file mode 100644
index 0000000000000..7f9dfd6319bf6
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/arrgetlen_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il
index 235535b581753..db9464446fb83 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly lcliimpl {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi lcliimpl {
.method public static int32 main() cil managed
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_d.il b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_d.il
new file mode 100644
index 0000000000000..5d8eababd6f8b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcliimpl_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_d.ilproj
new file mode 100644
index 0000000000000..6f493ea734cb8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
deleted file mode 100644
index 4350bc3ebe211..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
deleted file mode 100644
index 9cb9b69e53e95..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_r.il b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_r.il
new file mode 100644
index 0000000000000..f29019be701ea
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcliimpl_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_r.ilproj
new file mode 100644
index 0000000000000..44ead380bfd16
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/lcliimpl_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
index 8088ea9e9a886..33477a1264a3d 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly 'ldfldstatic' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit ldfldstatic
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_d.il b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_d.il
new file mode 100644
index 0000000000000..e9857e3716308
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldstatic_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_d.ilproj
new file mode 100644
index 0000000000000..fb272c413ccb8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
deleted file mode 100644
index c19fce5a16b16..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
deleted file mode 100644
index 3bdf6a289139f..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_r.il b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_r.il
new file mode 100644
index 0000000000000..f68f4386c8feb
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfldstatic_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_r.ilproj
new file mode 100644
index 0000000000000..c6545926be94f
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il
index 617b16ef91af3..03cbc6fd1f3b2 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldsshrstsfld {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit ldsshrstsfld
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_d.il b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_d.il
new file mode 100644
index 0000000000000..3b6f1492768bb
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldsshrstsfld_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_d.ilproj
new file mode 100644
index 0000000000000..b9c0c35df835b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
deleted file mode 100644
index 6f91e6012581c..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
deleted file mode 100644
index 597e8024dbb36..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_r.il b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_r.il
new file mode 100644
index 0000000000000..bc45f0030cb6a
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldsshrstsfld_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_r.ilproj
new file mode 100644
index 0000000000000..e2662e0a3a6c1
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldsshrstsfld_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il
index 53e37d8c22b52..7c348366076e5 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldvirtftncalli'
+.assembly ASSEMBLY_NAME
{
}
.class private auto ansi beforefieldinit A
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_d.il b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_d.il
new file mode 100644
index 0000000000000..2f30f78700f15
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldvirtftncalli_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_d.ilproj
new file mode 100644
index 0000000000000..8f64afcd744b4
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
deleted file mode 100644
index 34a01efaf4df7..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
deleted file mode 100644
index bbee5979d5e63..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_r.il b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_r.il
new file mode 100644
index 0000000000000..472e691ef548d
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldvirtftncalli_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_r.ilproj
new file mode 100644
index 0000000000000..42947d13a530c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldvirtftncalli_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il
index 413fd1fa325db..51adb2605036e 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern mscorlib {}
-.assembly ovfldiv1 {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit ovfldiv1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_d.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_d.il
new file mode 100644
index 0000000000000..50a2cf338ba5b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovfldiv1_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_d.ilproj
new file mode 100644
index 0000000000000..f88289d171626
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
deleted file mode 100644
index 4d50aafe30776..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
deleted file mode 100644
index eabd985ba4512..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_r.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_r.il
new file mode 100644
index 0000000000000..60881cf0bb9c6
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovfldiv1_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_r.ilproj
new file mode 100644
index 0000000000000..d6e88834eb0bd
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv1_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il
index 2a3cae8e0a262..d7dfb063b95db 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ovfldiv2 {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit ovfldiv2
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_d.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_d.il
new file mode 100644
index 0000000000000..906c1655ae3f6
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovfldiv2_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_d.ilproj
new file mode 100644
index 0000000000000..70087d2b9271c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
deleted file mode 100644
index 0d5c1cfa8e268..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
deleted file mode 100644
index 9c3dd7130e7cc..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_r.il b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_r.il
new file mode 100644
index 0000000000000..0c58b1e38e5ff
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovfldiv2_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_r.ilproj
new file mode 100644
index 0000000000000..8f1b7255fc856
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovfldiv2_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il
index 53340aa1c992f..0f26e4bf5b71e 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern mscorlib {}
-.assembly ovflrem1 {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit ovflrem1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_d.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_d.il
new file mode 100644
index 0000000000000..6c66b92125d39
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovflrem1_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_d.ilproj
new file mode 100644
index 0000000000000..2b8d91b5dd5a3
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
deleted file mode 100644
index 2157aa05a5ba5..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
deleted file mode 100644
index 5687fd1819d19..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_r.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_r.il
new file mode 100644
index 0000000000000..21bef36049a30
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovflrem1_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_r.ilproj
new file mode 100644
index 0000000000000..6f6823d2a1a01
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem1_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il
index 2c2fd0899a8c6..c0c1443995b9d 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ovflrem2 {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit ovflrem2
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_d.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_d.il
new file mode 100644
index 0000000000000..6a54cc495da60
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovflrem2_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_d.ilproj
new file mode 100644
index 0000000000000..e13e10f8b03d1
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
deleted file mode 100644
index 631256f798c31..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
deleted file mode 100644
index 94dad56a1bb44..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_r.il b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_r.il
new file mode 100644
index 0000000000000..70cab19d2c2ad
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ovflrem2_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_r.ilproj
new file mode 100644
index 0000000000000..9651d0b8815e6
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/ovflrem2_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il
index a3a8bf70858c4..65eec50c33609 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'stfldstatic1_oldtests' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit stfldstatic1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_d.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_d.il
new file mode 100644
index 0000000000000..607156ffe3e42
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic1_oldtests_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_d.ilproj
new file mode 100644
index 0000000000000..6f1704991abf4
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_d.ilproj
deleted file mode 100644
index fec3902875849..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_r.ilproj
deleted file mode 100644
index 8a995fdc2e1fd..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_r.ilproj
new file mode 100644
index 0000000000000..58fb5d9e96301
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_oldtests_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_r.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_r.il
new file mode 100644
index 0000000000000..e84576be7d10b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic1_oldtests_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il
index be1b5018b0dfb..868c3a76ae1bd 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly stfldstatic2 {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit stfldstatic2
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_d.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_d.il
new file mode 100644
index 0000000000000..4921fe30cd500
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic2_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_d.ilproj
new file mode 100644
index 0000000000000..b70c02a0ac452
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
deleted file mode 100644
index 7283e729df9cf..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
deleted file mode 100644
index dc628aa1154e7..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_r.il b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_r.il
new file mode 100644
index 0000000000000..ac10523d87ca9
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stfldstatic2_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_r.ilproj
new file mode 100644
index 0000000000000..02ac6636efede
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/stfldstatic2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref.il b/src/tests/JIT/Directed/coverage/oldtests/subbyref.il
index 4fbf54c1a3c84..8323c035d5c1a 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/subbyref.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref.il
@@ -14,7 +14,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly subbyref {}
+.assembly ASSEMBLY_NAME {}
.class public a extends [mscorlib]System.Object
{
.field static class ctest S_1
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_d.il b/src/tests/JIT/Directed/coverage/oldtests/subbyref_d.il
new file mode 100644
index 0000000000000..e06ec13bf19f6
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "subbyref_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/subbyref_d.ilproj
new file mode 100644
index 0000000000000..fd0e5a8fbc0c1
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
deleted file mode 100644
index 684da5733a393..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
deleted file mode 100644
index fb22770592285..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_r.il b/src/tests/JIT/Directed/coverage/oldtests/subbyref_r.il
new file mode 100644
index 0000000000000..bb1d45c4956b2
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "subbyref_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/subbyref_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/subbyref_r.ilproj
new file mode 100644
index 0000000000000..c16a7338fd12e
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/subbyref_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il
index 5b404eb36a06d..ad0c10970dad2 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly switchdefaultonly1 {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit switchdefaultonly1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_d.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_d.il
new file mode 100644
index 0000000000000..8c7eaedc495bc
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "switchdefaultonly1_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_d.ilproj
new file mode 100644
index 0000000000000..11cc434a5d463
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
deleted file mode 100644
index 5e1345a9a7b92..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
deleted file mode 100644
index 10320d32a77a9..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_r.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_r.il
new file mode 100644
index 0000000000000..a2fc96a33dff7
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "switchdefaultonly1_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_r.ilproj
new file mode 100644
index 0000000000000..fd83785c15014
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
index 05de8c052be4d..252b3a7da90c2 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'switchdefaultonly2' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit switchdefaultonly1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_d.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_d.il
new file mode 100644
index 0000000000000..f19d43e99f250
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "switchdefaultonly2_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_d.ilproj
new file mode 100644
index 0000000000000..54aa71dbd1700
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
deleted file mode 100644
index f533d1495c21c..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
deleted file mode 100644
index eee70d7c828c8..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_r.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_r.il
new file mode 100644
index 0000000000000..58c13e2f391c8
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "switchdefaultonly2_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_r.ilproj
new file mode 100644
index 0000000000000..6b08d3c8160b1
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
index 5f27849498995..a649e61ce7617 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'switchdefaultonly3' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi beforefieldinit switchdefaultonly1
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_d.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_d.il
new file mode 100644
index 0000000000000..6d9771a764935
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "switchdefaultonly3_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_d.ilproj
new file mode 100644
index 0000000000000..30d391e214c52
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
deleted file mode 100644
index 007a2b892f4e1..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
deleted file mode 100644
index 916cbccf20a67..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_r.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_r.il
new file mode 100644
index 0000000000000..977e136945b23
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "switchdefaultonly3_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_r.ilproj
new file mode 100644
index 0000000000000..2cf49a7c3458c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest.il b/src/tests/JIT/Directed/coverage/oldtests/tlstest.il
index 6611b7dc4f6a8..717b3e9d1b3a7 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/tlstest.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest.il
@@ -12,7 +12,7 @@
.assembly extern mscorlib {}
.assembly extern tls1 {}
.assembly extern tls2 {}
-.assembly tlstest {}
+.assembly ASSEMBLY_NAME {}
.namespace 'tls'
{
.class public auto ansi beforefieldinit tlstest
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_d.il b/src/tests/JIT/Directed/coverage/oldtests/tlstest_d.il
new file mode 100644
index 0000000000000..f0c91819fb939
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tlstest_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/tlstest_d.ilproj
new file mode 100644
index 0000000000000..1dfe2736b365b
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest_d.ilproj
@@ -0,0 +1,17 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
deleted file mode 100644
index 587d86267cc89..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
deleted file mode 100644
index c912d84ea5ab7..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_r.il b/src/tests/JIT/Directed/coverage/oldtests/tlstest_r.il
new file mode 100644
index 0000000000000..f12b1c3bf9349
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tlstest_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/tlstest_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/tlstest_r.ilproj
new file mode 100644
index 0000000000000..03f8a0c3dac68
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/tlstest_r.ilproj
@@ -0,0 +1,18 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg.il b/src/tests/JIT/Directed/coverage/oldtests/trashreg.il
index 8e32cb0bfc21e..de77fa3483e0f 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/trashreg.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'trashreg' {}
+.assembly ASSEMBLY_NAME {}
.class public sealed a extends [mscorlib]System.Object
{
// specifying beforefieldinit here makes this sample work
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_d.il b/src/tests/JIT/Directed/coverage/oldtests/trashreg_d.il
new file mode 100644
index 0000000000000..e9dbdb5707a69
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "trashreg_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/trashreg_d.ilproj
new file mode 100644
index 0000000000000..3cb38791003f9
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
deleted file mode 100644
index 57c53b4b08c0e..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
deleted file mode 100644
index 2492802403896..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_r.il b/src/tests/JIT/Directed/coverage/oldtests/trashreg_r.il
new file mode 100644
index 0000000000000..27cd020d4cc26
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "trashreg_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/trashreg_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/trashreg_r.ilproj
new file mode 100644
index 0000000000000..5565a09ac78f2
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/trashreg_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il
index afe01f714294f..5b586fc5c317f 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly volatilecpobj { }
+.assembly ASSEMBLY_NAME { }
.namespace JitTest
{
.class public sequential ansi sealed beforefieldinit Test
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_d.il b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_d.il
new file mode 100644
index 0000000000000..722d669e2d8fe
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatilecpobj_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_d.ilproj
new file mode 100644
index 0000000000000..a5b75a346e7ba
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
deleted file mode 100644
index 000d602094950..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
deleted file mode 100644
index 8fddfad376d40..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_r.il b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_r.il
new file mode 100644
index 0000000000000..b8b9da3c22057
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatilecpobj_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_r.ilproj
new file mode 100644
index 0000000000000..2b8f145f0991c
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/volatilecpobj_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il b/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il
index c1d31592a63ac..0d9601707d35f 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly zeroinit {}
+.assembly ASSEMBLY_NAME {}
.class private auto ansi beforefieldinit CL
extends [mscorlib]System.Object
{
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_d.il b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_d.il
new file mode 100644
index 0000000000000..69cff0c9c69fe
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "zeroinit_d"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_d.ilproj
new file mode 100644
index 0000000000000..fc38ce135a457
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
deleted file mode 100644
index a76cdfbb36f11..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
deleted file mode 100644
index a24818adec0f5..0000000000000
--- a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_r.il b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_r.il
new file mode 100644
index 0000000000000..abfc4fcf29919
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "zeroinit_r"
diff --git a/src/tests/JIT/Directed/coverage/oldtests/zeroinit_r.ilproj b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_r.ilproj
new file mode 100644
index 0000000000000..8d75e143acd38
--- /dev/null
+++ b/src/tests/JIT/Directed/coverage/oldtests/zeroinit_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/catch1.il b/src/tests/JIT/Directed/leave/catch1.il
index 41ac2254db77d..d09eaab72be28 100644
--- a/src/tests/JIT/Directed/leave/catch1.il
+++ b/src/tests/JIT/Directed/leave/catch1.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly catch1
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/catch1_d.il b/src/tests/JIT/Directed/leave/catch1_d.il
new file mode 100644
index 0000000000000..da43b9eaeffd3
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catch1_d"
diff --git a/src/tests/JIT/Directed/leave/catch1_d.ilproj b/src/tests/JIT/Directed/leave/catch1_d.ilproj
new file mode 100644
index 0000000000000..197f5856663f3
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/catch1_il_d.ilproj b/src/tests/JIT/Directed/leave/catch1_il_d.ilproj
deleted file mode 100644
index 88b87e60e6e6b..0000000000000
--- a/src/tests/JIT/Directed/leave/catch1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/catch1_il_r.ilproj b/src/tests/JIT/Directed/leave/catch1_il_r.ilproj
deleted file mode 100644
index 4e7c9523cd61e..0000000000000
--- a/src/tests/JIT/Directed/leave/catch1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/catch1_r.il b/src/tests/JIT/Directed/leave/catch1_r.il
new file mode 100644
index 0000000000000..bd819e8531884
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catch1_r"
diff --git a/src/tests/JIT/Directed/leave/catch1_r.ilproj b/src/tests/JIT/Directed/leave/catch1_r.ilproj
new file mode 100644
index 0000000000000..8e330aebd01e6
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/catch2.il b/src/tests/JIT/Directed/leave/catch2.il
index 22569aee6e5d3..ae314996abaea 100644
--- a/src/tests/JIT/Directed/leave/catch2.il
+++ b/src/tests/JIT/Directed/leave/catch2.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly catch2
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/catch2_d.il b/src/tests/JIT/Directed/leave/catch2_d.il
new file mode 100644
index 0000000000000..d453bf819a414
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catch2_d"
diff --git a/src/tests/JIT/Directed/leave/catch2_d.ilproj b/src/tests/JIT/Directed/leave/catch2_d.ilproj
new file mode 100644
index 0000000000000..913709de67fa0
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/catch2_il_d.ilproj b/src/tests/JIT/Directed/leave/catch2_il_d.ilproj
deleted file mode 100644
index 372707cfcad07..0000000000000
--- a/src/tests/JIT/Directed/leave/catch2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/catch2_il_r.ilproj b/src/tests/JIT/Directed/leave/catch2_il_r.ilproj
deleted file mode 100644
index b8079243adf8c..0000000000000
--- a/src/tests/JIT/Directed/leave/catch2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/catch2_r.il b/src/tests/JIT/Directed/leave/catch2_r.il
new file mode 100644
index 0000000000000..c3d5c0e368c58
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catch2_r"
diff --git a/src/tests/JIT/Directed/leave/catch2_r.ilproj b/src/tests/JIT/Directed/leave/catch2_r.ilproj
new file mode 100644
index 0000000000000..35555becce259
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/catch3.il b/src/tests/JIT/Directed/leave/catch3.il
index 10ff037ce2b7f..92fd8091833cf 100644
--- a/src/tests/JIT/Directed/leave/catch3.il
+++ b/src/tests/JIT/Directed/leave/catch3.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly catch3
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/catch3_d.il b/src/tests/JIT/Directed/leave/catch3_d.il
new file mode 100644
index 0000000000000..a5ca8d41bdca0
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catch3_d"
diff --git a/src/tests/JIT/Directed/leave/catch3_d.ilproj b/src/tests/JIT/Directed/leave/catch3_d.ilproj
new file mode 100644
index 0000000000000..9e47438ed8b74
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/catch3_il_d.ilproj b/src/tests/JIT/Directed/leave/catch3_il_d.ilproj
deleted file mode 100644
index 398f0d62273ec..0000000000000
--- a/src/tests/JIT/Directed/leave/catch3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/catch3_il_r.ilproj b/src/tests/JIT/Directed/leave/catch3_il_r.ilproj
deleted file mode 100644
index db8568cc100a5..0000000000000
--- a/src/tests/JIT/Directed/leave/catch3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/catch3_r.il b/src/tests/JIT/Directed/leave/catch3_r.il
new file mode 100644
index 0000000000000..c72accf10327a
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catch3_r"
diff --git a/src/tests/JIT/Directed/leave/catch3_r.ilproj b/src/tests/JIT/Directed/leave/catch3_r.ilproj
new file mode 100644
index 0000000000000..e76573f81c341
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/catch3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/filter1.il b/src/tests/JIT/Directed/leave/filter1.il
index 3c98c8c5af3f0..fc014834b1855 100644
--- a/src/tests/JIT/Directed/leave/filter1.il
+++ b/src/tests/JIT/Directed/leave/filter1.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly filter1
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/filter1_d.il b/src/tests/JIT/Directed/leave/filter1_d.il
new file mode 100644
index 0000000000000..6498ee2fc8eaa
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter1_d"
diff --git a/src/tests/JIT/Directed/leave/filter1_d.ilproj b/src/tests/JIT/Directed/leave/filter1_d.ilproj
new file mode 100644
index 0000000000000..20fa6a5b4a516
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/filter1_il_d.ilproj b/src/tests/JIT/Directed/leave/filter1_il_d.ilproj
deleted file mode 100644
index f2f27874cf762..0000000000000
--- a/src/tests/JIT/Directed/leave/filter1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/filter1_il_r.ilproj b/src/tests/JIT/Directed/leave/filter1_il_r.ilproj
deleted file mode 100644
index 54c25e37ed36f..0000000000000
--- a/src/tests/JIT/Directed/leave/filter1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/filter1_r.il b/src/tests/JIT/Directed/leave/filter1_r.il
new file mode 100644
index 0000000000000..a530209a569fc
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter1_r"
diff --git a/src/tests/JIT/Directed/leave/filter1_r.ilproj b/src/tests/JIT/Directed/leave/filter1_r.ilproj
new file mode 100644
index 0000000000000..70210e657cc7f
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/filter2.il b/src/tests/JIT/Directed/leave/filter2.il
index 63ba8df9b4d98..c4d7e174f607e 100644
--- a/src/tests/JIT/Directed/leave/filter2.il
+++ b/src/tests/JIT/Directed/leave/filter2.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly filter2
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/filter2_d.il b/src/tests/JIT/Directed/leave/filter2_d.il
new file mode 100644
index 0000000000000..12cd21b4fa0eb
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter2_d"
diff --git a/src/tests/JIT/Directed/leave/filter2_d.ilproj b/src/tests/JIT/Directed/leave/filter2_d.ilproj
new file mode 100644
index 0000000000000..d124843d8f8e8
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/filter2_il_d.ilproj b/src/tests/JIT/Directed/leave/filter2_il_d.ilproj
deleted file mode 100644
index 1e193a27078e6..0000000000000
--- a/src/tests/JIT/Directed/leave/filter2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/filter2_il_r.ilproj b/src/tests/JIT/Directed/leave/filter2_il_r.ilproj
deleted file mode 100644
index 7926f1228be42..0000000000000
--- a/src/tests/JIT/Directed/leave/filter2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/filter2_r.il b/src/tests/JIT/Directed/leave/filter2_r.il
new file mode 100644
index 0000000000000..eb9590a8d5183
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter2_r"
diff --git a/src/tests/JIT/Directed/leave/filter2_r.ilproj b/src/tests/JIT/Directed/leave/filter2_r.ilproj
new file mode 100644
index 0000000000000..9c3cd49c0b856
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/filter3.il b/src/tests/JIT/Directed/leave/filter3.il
index 12a6e3d1fa926..0ebc0be668fbb 100644
--- a/src/tests/JIT/Directed/leave/filter3.il
+++ b/src/tests/JIT/Directed/leave/filter3.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly filter3
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/filter3_d.il b/src/tests/JIT/Directed/leave/filter3_d.il
new file mode 100644
index 0000000000000..581d887b042c2
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter3_d"
diff --git a/src/tests/JIT/Directed/leave/filter3_d.ilproj b/src/tests/JIT/Directed/leave/filter3_d.ilproj
new file mode 100644
index 0000000000000..2a2644c24a0bf
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/filter3_il_d.ilproj b/src/tests/JIT/Directed/leave/filter3_il_d.ilproj
deleted file mode 100644
index 82b3295827c3d..0000000000000
--- a/src/tests/JIT/Directed/leave/filter3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/filter3_il_r.ilproj b/src/tests/JIT/Directed/leave/filter3_il_r.ilproj
deleted file mode 100644
index c9c5cd5253609..0000000000000
--- a/src/tests/JIT/Directed/leave/filter3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/filter3_r.il b/src/tests/JIT/Directed/leave/filter3_r.il
new file mode 100644
index 0000000000000..5eac3fb181216
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter3_r"
diff --git a/src/tests/JIT/Directed/leave/filter3_r.ilproj b/src/tests/JIT/Directed/leave/filter3_r.ilproj
new file mode 100644
index 0000000000000..f39d1e4e81c38
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/filter3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/try1.il b/src/tests/JIT/Directed/leave/try1.il
index f40f7801caee0..5cd188c2397fc 100644
--- a/src/tests/JIT/Directed/leave/try1.il
+++ b/src/tests/JIT/Directed/leave/try1.il
@@ -10,7 +10,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly try1
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/try1_d.il b/src/tests/JIT/Directed/leave/try1_d.il
new file mode 100644
index 0000000000000..e353b6cf4d916
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try1_d"
diff --git a/src/tests/JIT/Directed/leave/try1_d.ilproj b/src/tests/JIT/Directed/leave/try1_d.ilproj
new file mode 100644
index 0000000000000..2573470c8b372
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/try1_il_d.ilproj b/src/tests/JIT/Directed/leave/try1_il_d.ilproj
deleted file mode 100644
index 3b6350e9b1882..0000000000000
--- a/src/tests/JIT/Directed/leave/try1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/try1_il_r.ilproj b/src/tests/JIT/Directed/leave/try1_il_r.ilproj
deleted file mode 100644
index 30fb504ffdc2b..0000000000000
--- a/src/tests/JIT/Directed/leave/try1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/try1_r.il b/src/tests/JIT/Directed/leave/try1_r.il
new file mode 100644
index 0000000000000..92f9b2cb3d912
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try1_r"
diff --git a/src/tests/JIT/Directed/leave/try1_r.ilproj b/src/tests/JIT/Directed/leave/try1_r.ilproj
new file mode 100644
index 0000000000000..a68a664519ee9
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/try2.il b/src/tests/JIT/Directed/leave/try2.il
index 25b44082a95db..aaa687072b55e 100644
--- a/src/tests/JIT/Directed/leave/try2.il
+++ b/src/tests/JIT/Directed/leave/try2.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly try2
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/try2_d.il b/src/tests/JIT/Directed/leave/try2_d.il
new file mode 100644
index 0000000000000..d6115a0409ee9
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try2_d"
diff --git a/src/tests/JIT/Directed/leave/try2_d.ilproj b/src/tests/JIT/Directed/leave/try2_d.ilproj
new file mode 100644
index 0000000000000..ddd926b47554f
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/try2_il_d.ilproj b/src/tests/JIT/Directed/leave/try2_il_d.ilproj
deleted file mode 100644
index 275176991c3f2..0000000000000
--- a/src/tests/JIT/Directed/leave/try2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/try2_il_r.ilproj b/src/tests/JIT/Directed/leave/try2_il_r.ilproj
deleted file mode 100644
index 476aa50c5594d..0000000000000
--- a/src/tests/JIT/Directed/leave/try2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/try2_r.il b/src/tests/JIT/Directed/leave/try2_r.il
new file mode 100644
index 0000000000000..515d5fcfb955f
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try2_r"
diff --git a/src/tests/JIT/Directed/leave/try2_r.ilproj b/src/tests/JIT/Directed/leave/try2_r.ilproj
new file mode 100644
index 0000000000000..73f9aea379dcf
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/try3.il b/src/tests/JIT/Directed/leave/try3.il
index e9beb1aef661e..4d2e59495f25e 100644
--- a/src/tests/JIT/Directed/leave/try3.il
+++ b/src/tests/JIT/Directed/leave/try3.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly try3
+.assembly ASSEMBLY_NAME
{
}
.class private sealed VT
diff --git a/src/tests/JIT/Directed/leave/try3_d.il b/src/tests/JIT/Directed/leave/try3_d.il
new file mode 100644
index 0000000000000..16823604f14d0
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try3_d"
diff --git a/src/tests/JIT/Directed/leave/try3_d.ilproj b/src/tests/JIT/Directed/leave/try3_d.ilproj
new file mode 100644
index 0000000000000..4ac151372d0f3
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/leave/try3_il_d.ilproj b/src/tests/JIT/Directed/leave/try3_il_d.ilproj
deleted file mode 100644
index ce9d30b766a30..0000000000000
--- a/src/tests/JIT/Directed/leave/try3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/try3_il_r.ilproj b/src/tests/JIT/Directed/leave/try3_il_r.ilproj
deleted file mode 100644
index 08eafdeb26be4..0000000000000
--- a/src/tests/JIT/Directed/leave/try3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/leave/try3_r.il b/src/tests/JIT/Directed/leave/try3_r.il
new file mode 100644
index 0000000000000..c9f899463bea8
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try3_r"
diff --git a/src/tests/JIT/Directed/leave/try3_r.ilproj b/src/tests/JIT/Directed/leave/try3_r.ilproj
new file mode 100644
index 0000000000000..f7bc443e436f8
--- /dev/null
+++ b/src/tests/JIT/Directed/leave/try3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il b/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il
index 69e587ec0128d..1fbf2bc664452 100644
--- a/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il
+++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern helper {}
-.assembly callconv3 {}
+.assembly ASSEMBLY_NAME {}
.namespace PrimitiveVT
{
.class public auto ansi beforefieldinit CallConv3
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_d.il b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_d.il
new file mode 100644
index 0000000000000..961b12bafec70
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "callconv3_d"
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_d.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_d.ilproj
new file mode 100644
index 0000000000000..88e992464d2bc
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
deleted file mode 100644
index 2e818485f29ae..0000000000000
--- a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
deleted file mode 100644
index f07caf71ab98a..0000000000000
--- a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_r.il b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_r.il
new file mode 100644
index 0000000000000..3ae7464ac7b24
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "callconv3_r"
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/callconv3_r.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_r.ilproj
new file mode 100644
index 0000000000000..178a1898bb5e8
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/callconv3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3.il b/src/tests/JIT/Directed/perffix/primitivevt/identity3.il
index 6c70c189d7551..dfbd003e2bc26 100644
--- a/src/tests/JIT/Directed/perffix/primitivevt/identity3.il
+++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern nativeinthelper {}
-.assembly identity3 {}
+.assembly ASSEMBLY_NAME {}
.namespace PrimitiveVT
{
.class public auto ansi beforefieldinit Identity3
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_d.il b/src/tests/JIT/Directed/perffix/primitivevt/identity3_d.il
new file mode 100644
index 0000000000000..ef41181ade8ca
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "identity3_d"
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_d.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/identity3_d.ilproj
new file mode 100644
index 0000000000000..3c800f2e59228
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
deleted file mode 100644
index a53ffbe98d133..0000000000000
--- a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
deleted file mode 100644
index 85bbdfc7fd399..0000000000000
--- a/src/tests/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_r.il b/src/tests/JIT/Directed/perffix/primitivevt/identity3_r.il
new file mode 100644
index 0000000000000..354daf66027d1
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "identity3_r"
diff --git a/src/tests/JIT/Directed/perffix/primitivevt/identity3_r.ilproj b/src/tests/JIT/Directed/perffix/primitivevt/identity3_r.ilproj
new file mode 100644
index 0000000000000..b32324cdcd6e2
--- /dev/null
+++ b/src/tests/JIT/Directed/perffix/primitivevt/identity3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu.il b/src/tests/JIT/Directed/refbyref/byref2iu.il
index 5b866e5062ad7..bc5d40f547322 100644
--- a/src/tests/JIT/Directed/refbyref/byref2iu.il
+++ b/src/tests/JIT/Directed/refbyref/byref2iu.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly byref2iu {}
+.assembly ASSEMBLY_NAME {}
.field static char c
.class public auto ansi byref2iu {
.method public static int32 Main()
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_d.il b/src/tests/JIT/Directed/refbyref/byref2iu_d.il
new file mode 100644
index 0000000000000..82a64cf6e8910
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byref2iu_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "byref2iu_d"
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_d.ilproj b/src/tests/JIT/Directed/refbyref/byref2iu_d.ilproj
new file mode 100644
index 0000000000000..f08fb7011acb0
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byref2iu_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj b/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj
deleted file mode 100644
index 955702aed096d..0000000000000
--- a/src/tests/JIT/Directed/refbyref/byref2iu_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj b/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj
deleted file mode 100644
index 7b32b41de1466..0000000000000
--- a/src/tests/JIT/Directed/refbyref/byref2iu_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_r.il b/src/tests/JIT/Directed/refbyref/byref2iu_r.il
new file mode 100644
index 0000000000000..a82ddff0a799c
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byref2iu_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "byref2iu_r"
diff --git a/src/tests/JIT/Directed/refbyref/byref2iu_r.ilproj b/src/tests/JIT/Directed/refbyref/byref2iu_r.ilproj
new file mode 100644
index 0000000000000..3a3d00676579b
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byref2iu_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert.il b/src/tests/JIT/Directed/refbyref/byrefconvert.il
index 888ffa3a66525..39774436489ff 100644
--- a/src/tests/JIT/Directed/refbyref/byrefconvert.il
+++ b/src/tests/JIT/Directed/refbyref/byrefconvert.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly byrefconvert {}
+.assembly ASSEMBLY_NAME {}
.module byrefconvert.exe
.class public auto ansi byrefconvert {
.method public static int32 Main() cil managed
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_d.il b/src/tests/JIT/Directed/refbyref/byrefconvert_d.il
new file mode 100644
index 0000000000000..b4732d7fa3f0e
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byrefconvert_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "byrefconvert_d"
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_d.ilproj b/src/tests/JIT/Directed/refbyref/byrefconvert_d.ilproj
new file mode 100644
index 0000000000000..8e696158d82e1
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byrefconvert_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj b/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
deleted file mode 100644
index 613358453e021..0000000000000
--- a/src/tests/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj b/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
deleted file mode 100644
index c69628a6d382e..0000000000000
--- a/src/tests/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_r.il b/src/tests/JIT/Directed/refbyref/byrefconvert_r.il
new file mode 100644
index 0000000000000..b0ea25b101438
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byrefconvert_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "byrefconvert_r"
diff --git a/src/tests/JIT/Directed/refbyref/byrefconvert_r.ilproj b/src/tests/JIT/Directed/refbyref/byrefconvert_r.ilproj
new file mode 100644
index 0000000000000..03121fa06198b
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/byrefconvert_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref.il b/src/tests/JIT/Directed/refbyref/ref2byref.il
index 0b3b08e24fa8d..7df8025669f64 100644
--- a/src/tests/JIT/Directed/refbyref/ref2byref.il
+++ b/src/tests/JIT/Directed/refbyref/ref2byref.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly ref2byref {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi ref2byref {
.method public static int32 Main()
{
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_d.il b/src/tests/JIT/Directed/refbyref/ref2byref_d.il
new file mode 100644
index 0000000000000..816fd700b9577
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2byref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ref2byref_d"
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_d.ilproj b/src/tests/JIT/Directed/refbyref/ref2byref_d.ilproj
new file mode 100644
index 0000000000000..720c62dfaad76
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2byref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj b/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj
deleted file mode 100644
index 57a097e55009b..0000000000000
--- a/src/tests/JIT/Directed/refbyref/ref2byref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj b/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj
deleted file mode 100644
index 17098228b670c..0000000000000
--- a/src/tests/JIT/Directed/refbyref/ref2byref_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_r.il b/src/tests/JIT/Directed/refbyref/ref2byref_r.il
new file mode 100644
index 0000000000000..8154b8d8ead21
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2byref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ref2byref_r"
diff --git a/src/tests/JIT/Directed/refbyref/ref2byref_r.ilproj b/src/tests/JIT/Directed/refbyref/ref2byref_r.ilproj
new file mode 100644
index 0000000000000..38bd3f73e123a
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2byref_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu.il b/src/tests/JIT/Directed/refbyref/ref2iu.il
index ae0bc2e0d7a89..5c4e95cfaf5fe 100644
--- a/src/tests/JIT/Directed/refbyref/ref2iu.il
+++ b/src/tests/JIT/Directed/refbyref/ref2iu.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly ref2iu {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi ref2iu {
.method public static int32 Main()
{
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_d.il b/src/tests/JIT/Directed/refbyref/ref2iu_d.il
new file mode 100644
index 0000000000000..cb2798983419f
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2iu_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ref2iu_d"
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_d.ilproj b/src/tests/JIT/Directed/refbyref/ref2iu_d.ilproj
new file mode 100644
index 0000000000000..9f2aa2b771188
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2iu_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj b/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj
deleted file mode 100644
index b41b766efae4e..0000000000000
--- a/src/tests/JIT/Directed/refbyref/ref2iu_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj b/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj
deleted file mode 100644
index 1a90c13cc9c46..0000000000000
--- a/src/tests/JIT/Directed/refbyref/ref2iu_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_r.il b/src/tests/JIT/Directed/refbyref/ref2iu_r.il
new file mode 100644
index 0000000000000..fc4a034ea579d
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2iu_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ref2iu_r"
diff --git a/src/tests/JIT/Directed/refbyref/ref2iu_r.ilproj b/src/tests/JIT/Directed/refbyref/ref2iu_r.ilproj
new file mode 100644
index 0000000000000..57b840f0f553e
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/ref2iu_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu.il b/src/tests/JIT/Directed/refbyref/refpinned2iu.il
index f9dda179c3d71..f48328217f8f0 100644
--- a/src/tests/JIT/Directed/refbyref/refpinned2iu.il
+++ b/src/tests/JIT/Directed/refbyref/refpinned2iu.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
-.assembly 'refpinned2iu' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi refpinned2iu {
.method public static int32 Main()
{
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_d.il b/src/tests/JIT/Directed/refbyref/refpinned2iu_d.il
new file mode 100644
index 0000000000000..1516fa03639a8
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/refpinned2iu_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refpinned2iu_d"
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_d.ilproj b/src/tests/JIT/Directed/refbyref/refpinned2iu_d.ilproj
new file mode 100644
index 0000000000000..2345ef7066920
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/refpinned2iu_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj b/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
deleted file mode 100644
index 5447d81846d9d..0000000000000
--- a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj b/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
deleted file mode 100644
index f83d611082d88..0000000000000
--- a/src/tests/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_r.il b/src/tests/JIT/Directed/refbyref/refpinned2iu_r.il
new file mode 100644
index 0000000000000..d3bc7a977eb9c
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/refpinned2iu_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refpinned2iu_r"
diff --git a/src/tests/JIT/Directed/refbyref/refpinned2iu_r.ilproj b/src/tests/JIT/Directed/refbyref/refpinned2iu_r.ilproj
new file mode 100644
index 0000000000000..2bdd54e011b93
--- /dev/null
+++ b/src/tests/JIT/Directed/refbyref/refpinned2iu_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/shift/int8.il b/src/tests/JIT/Directed/shift/int8.il
index f054afae4102f..fd3d4f7b091de 100644
--- a/src/tests/JIT/Directed/shift/int8.il
+++ b/src/tests/JIT/Directed/shift/int8.il
@@ -13,7 +13,7 @@
.assembly extern mscorlib
{
}
-.assembly 'int8'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Directed/shift/int8_d.il b/src/tests/JIT/Directed/shift/int8_d.il
new file mode 100644
index 0000000000000..5c7ecb4505282
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/int8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int8_d"
diff --git a/src/tests/JIT/Directed/shift/int8_d.ilproj b/src/tests/JIT/Directed/shift/int8_d.ilproj
new file mode 100644
index 0000000000000..3bb3f8bbdc77d
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/int8_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/shift/int8_il_d.ilproj b/src/tests/JIT/Directed/shift/int8_il_d.ilproj
deleted file mode 100644
index e9ed0680925a3..0000000000000
--- a/src/tests/JIT/Directed/shift/int8_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/shift/int8_il_r.ilproj b/src/tests/JIT/Directed/shift/int8_il_r.ilproj
deleted file mode 100644
index a23587773813d..0000000000000
--- a/src/tests/JIT/Directed/shift/int8_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/shift/int8_r.il b/src/tests/JIT/Directed/shift/int8_r.il
new file mode 100644
index 0000000000000..eabf993dd8e44
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/int8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int8_r"
diff --git a/src/tests/JIT/Directed/shift/int8_r.ilproj b/src/tests/JIT/Directed/shift/int8_r.ilproj
new file mode 100644
index 0000000000000..810d7e448202a
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/int8_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/shift/nativeint.il b/src/tests/JIT/Directed/shift/nativeint.il
index 232ef7c95fbfe..8998444283fa6 100644
--- a/src/tests/JIT/Directed/shift/nativeint.il
+++ b/src/tests/JIT/Directed/shift/nativeint.il
@@ -13,7 +13,7 @@
.assembly extern mscorlib
{
}
-.assembly 'nativeint'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Directed/shift/nativeint_d.il b/src/tests/JIT/Directed/shift/nativeint_d.il
new file mode 100644
index 0000000000000..de9b19c74b8bb
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeint_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nativeint_d"
diff --git a/src/tests/JIT/Directed/shift/nativeint_d.ilproj b/src/tests/JIT/Directed/shift/nativeint_d.ilproj
new file mode 100644
index 0000000000000..18a5e2dae14a5
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeint_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj b/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj
deleted file mode 100644
index b895ac4a94220..0000000000000
--- a/src/tests/JIT/Directed/shift/nativeint_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj b/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj
deleted file mode 100644
index 04a0586e0a94b..0000000000000
--- a/src/tests/JIT/Directed/shift/nativeint_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/shift/nativeint_r.il b/src/tests/JIT/Directed/shift/nativeint_r.il
new file mode 100644
index 0000000000000..62b0228dafceb
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeint_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nativeint_r"
diff --git a/src/tests/JIT/Directed/shift/nativeint_r.ilproj b/src/tests/JIT/Directed/shift/nativeint_r.ilproj
new file mode 100644
index 0000000000000..fad450b7911c0
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeint_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/shift/nativeuint.il b/src/tests/JIT/Directed/shift/nativeuint.il
index cccb946d6e908..eea0e215a3115 100644
--- a/src/tests/JIT/Directed/shift/nativeuint.il
+++ b/src/tests/JIT/Directed/shift/nativeuint.il
@@ -13,7 +13,7 @@
.assembly extern mscorlib
{
}
-.assembly 'nativeuint'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Directed/shift/nativeuint_d.il b/src/tests/JIT/Directed/shift/nativeuint_d.il
new file mode 100644
index 0000000000000..fe9351ebb704e
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeuint_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nativeuint_d"
diff --git a/src/tests/JIT/Directed/shift/nativeuint_d.ilproj b/src/tests/JIT/Directed/shift/nativeuint_d.ilproj
new file mode 100644
index 0000000000000..64a1ee9009a3d
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeuint_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj b/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj
deleted file mode 100644
index 19fbb7e2d75a0..0000000000000
--- a/src/tests/JIT/Directed/shift/nativeuint_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj b/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj
deleted file mode 100644
index 7088f8a6ec273..0000000000000
--- a/src/tests/JIT/Directed/shift/nativeuint_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Directed/shift/nativeuint_r.il b/src/tests/JIT/Directed/shift/nativeuint_r.il
new file mode 100644
index 0000000000000..6c4d00d011bb0
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeuint_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nativeuint_r"
diff --git a/src/tests/JIT/Directed/shift/nativeuint_r.ilproj b/src/tests/JIT/Directed/shift/nativeuint_r.ilproj
new file mode 100644
index 0000000000000..5b31b19627913
--- /dev/null
+++ b/src/tests/JIT/Directed/shift/nativeuint_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b.il b/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
index 2ca4cb2ff324d..bd8418fd7dcea 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
@@ -19,7 +19,7 @@
}
-.assembly 'huge_b'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_b_d.il
new file mode 100644
index 0000000000000..90b658f03b56b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_b_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_d.ilproj
new file mode 100644
index 0000000000000..af7f4724bc314
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj
deleted file mode 100644
index 2cbe0cc56f7d8..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
deleted file mode 100644
index d2bb6937f20b2..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_b_r.il
new file mode 100644
index 0000000000000..4f3071f3ff020
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_b_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_r.ilproj
new file mode 100644
index 0000000000000..549bfd0de92f9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
index a7d552018c1e6..a93f372f22b18 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
@@ -19,7 +19,7 @@
}
-.assembly 'huge_i4'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_d.il
new file mode 100644
index 0000000000000..b40e87b568c1a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_i4_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_d.ilproj
new file mode 100644
index 0000000000000..02546afa4f157
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
deleted file mode 100644
index f68f7ae40595a..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
deleted file mode 100644
index 88e02eafd12a6..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_r.il
new file mode 100644
index 0000000000000..85db7c5877a43
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_i4_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_r.ilproj
new file mode 100644
index 0000000000000..a3c4147183d54
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
index 9715a4dbee3be..5714a0d2a96e3 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
@@ -15,7 +15,7 @@
.assembly extern mscorlib
{
}
-.assembly 'huge_objref'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_d.il
new file mode 100644
index 0000000000000..cdd4ab2179a17
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_objref_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_d.ilproj
new file mode 100644
index 0000000000000..0d6c5e96fc4e5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
deleted file mode 100644
index 25bbafa9e5668..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
deleted file mode 100644
index 66cf95a96a994..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_r.il
new file mode 100644
index 0000000000000..c81ccb780365a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_objref_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_r.ilproj
new file mode 100644
index 0000000000000..b7dc787df392c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
index 2c4c00076dbf0..bbca4966b295c 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
@@ -19,7 +19,7 @@
}
-.assembly 'huge_r4'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_d.il
new file mode 100644
index 0000000000000..4de4c8ccde7ef
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_r4_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_d.ilproj
new file mode 100644
index 0000000000000..97ebb8ed78e39
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
deleted file mode 100644
index b6ccf95c650ea..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
deleted file mode 100644
index 53c12cb9b6953..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_r.il
new file mode 100644
index 0000000000000..4b05abf3c3f7c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_r4_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_r.ilproj
new file mode 100644
index 0000000000000..14eb9c9da34f6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
index 9d1532b447c9e..1eba83f83382c 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
@@ -19,7 +19,7 @@
}
-.assembly 'huge_r8'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_d.il
new file mode 100644
index 0000000000000..ff63755d58666
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_r8_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_d.ilproj
new file mode 100644
index 0000000000000..05601bd18d893
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
deleted file mode 100644
index 523f6fae457bd..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
deleted file mode 100644
index f043a6fa74178..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_r.il
new file mode 100644
index 0000000000000..b89fd1cd7ed6e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_r8_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_r.ilproj
new file mode 100644
index 0000000000000..11ba9e16f737c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
index 94b13977aa30c..3d11fa69c7dd0 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
@@ -19,7 +19,7 @@
}
-.assembly 'huge_struct'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_d.il
new file mode 100644
index 0000000000000..eb2753d523d08
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_struct_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_d.ilproj
new file mode 100644
index 0000000000000..175984be77020
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
deleted file mode 100644
index 9483d38f9cd49..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
deleted file mode 100644
index f5b065d62f2d7..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_r.il
new file mode 100644
index 0000000000000..15d879fd3fc9c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_struct_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_r.ilproj
new file mode 100644
index 0000000000000..3a0711c07e723
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
index 6d9fe67461da6..1c6f1669b4fe9 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
@@ -19,7 +19,7 @@
}
-.assembly 'huge_u8'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_d.il b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_d.il
new file mode 100644
index 0000000000000..2e7c094807a67
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_u8_d"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_d.ilproj
new file mode 100644
index 0000000000000..57650cb3b71bc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
deleted file mode 100644
index 8c7fc726f20d3..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
deleted file mode 100644
index e9352bee49b96..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_r.il b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_r.il
new file mode 100644
index 0000000000000..baa1407392ef6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_u8_r"
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_r.ilproj
new file mode 100644
index 0000000000000..f64694d2dfe36
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
index b1094afaccfb0..c3ef5c70ba49e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'lcs_ldlen'// as "lcs"
+.assembly ASSEMBLY_NAME// as "lcs"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_d.il b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_d.il
new file mode 100644
index 0000000000000..4cf347b45f062
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_ldlen_d"
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_d.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_d.ilproj
new file mode 100644
index 0000000000000..efd69bd78660f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
deleted file mode 100644
index 384d645d83d95..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
deleted file mode 100644
index 9db558bf08a2d..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_r.il b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_r.il
new file mode 100644
index 0000000000000..8d270ebcb3d02
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_ldlen_r"
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_r.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_r.ilproj
new file mode 100644
index 0000000000000..2807a08fb6e9d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address.il b/src/tests/JIT/Methodical/Arrays/misc/address.il
index 76d4b70de8f2e..1d0182efae129 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/address.il
@@ -16,7 +16,7 @@
.assembly extern mscorlib
{
}
-.assembly 'address'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_d.il b/src/tests/JIT/Methodical/Arrays/misc/address_d.il
new file mode 100644
index 0000000000000..8c3f04d440907
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "address_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_d.ilproj
new file mode 100644
index 0000000000000..8f81041a2d791
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
deleted file mode 100644
index ca690302bacbb..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
deleted file mode 100644
index 3a4c133b2f425..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_r.il b/src/tests/JIT/Methodical/Arrays/misc/address_r.il
new file mode 100644
index 0000000000000..5d51c70405ce9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "address_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_r.ilproj
new file mode 100644
index 0000000000000..4818fdbba56c7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.il b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
index 0475dddb3ca8a..fcf2096c3c605 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
@@ -16,7 +16,7 @@
.assembly extern mscorlib
{
}
-.assembly 'arrres'// as "arrres"
+.assembly arrres_il_r
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
index 0d983860efffb..bbc2469480258 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
@@ -16,7 +16,7 @@
.assembly extern mscorlib
{
}
-.assembly 'gcarr'// as "gcarr"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.il b/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.il
new file mode 100644
index 0000000000000..23b1dbb1d786b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcarr_il_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
index 08c742d37c8e1..72bc7896bbea8 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
@@ -8,6 +8,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
index d570b371faced..34514571e8d14 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.il b/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.il
new file mode 100644
index 0000000000000..200a65e16167a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcarr_il_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
index 214517c298277..8a1c5b2eacfc6 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
@@ -6,7 +6,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89)
.ver 4:0:0:0
}
-.assembly initializearray
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_d.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_d.il
new file mode 100644
index 0000000000000..bf2c1167dc22d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "initializearray_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_d.ilproj
new file mode 100644
index 0000000000000..fabe6453eba9c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_d.ilproj
@@ -0,0 +1,10 @@
+
+
+ Full
+ false
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
index d495248f16eda..bcfc8678b79ba 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
@@ -67,7 +67,7 @@ class My {
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
-.assembly initializearray_enum
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_d.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_d.il
new file mode 100644
index 0000000000000..692257f42c229
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "initializearray_enum_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_d.ilproj
new file mode 100644
index 0000000000000..79830a29356d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
deleted file mode 100644
index e2f9d6a08e031..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
deleted file mode 100644
index f26b6b3066bc4..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_r.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_r.il
new file mode 100644
index 0000000000000..c4768ebc494a1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "initializearray_enum_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_r.ilproj
new file mode 100644
index 0000000000000..cb4b6f2ec4850
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
deleted file mode 100644
index cd43457cf41f1..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- Full
- false
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
deleted file mode 100644
index 573a25a4ab9a3..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_r.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_r.il
new file mode 100644
index 0000000000000..0c8de21746e18
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "initializearray_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_r.ilproj
new file mode 100644
index 0000000000000..b2c4e21babe86
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
index 92e8cb9c0fc44..d812e3cd080ff 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
@@ -20,7 +20,7 @@
}
-.assembly 'ldelem_get'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_d.il b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_d.il
new file mode 100644
index 0000000000000..b5af0ba250e54
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldelem_get_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_d.ilproj
new file mode 100644
index 0000000000000..3b680653d25ce
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
deleted file mode 100644
index 855e4d8f6ec2f..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
deleted file mode 100644
index 3a4dcb67f9313..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_r.il b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_r.il
new file mode 100644
index 0000000000000..82e06a1007b4e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldelem_get_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_r.ilproj
new file mode 100644
index 0000000000000..5775422393e06
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0.il b/src/tests/JIT/Methodical/Arrays/misc/length0.il
index 02cc7714ec175..d49c2758edb6d 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0.il
@@ -20,7 +20,7 @@
}
-.assembly 'length0'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_d.il b/src/tests/JIT/Methodical/Arrays/misc/length0_d.il
new file mode 100644
index 0000000000000..46ce0f3b75710
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "length0_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_d.ilproj
new file mode 100644
index 0000000000000..2e3fa987d78a5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
deleted file mode 100644
index bb52e31721bd6..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
deleted file mode 100644
index 1f851227d3713..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_r.il b/src/tests/JIT/Methodical/Arrays/misc/length0_r.il
new file mode 100644
index 0000000000000..4ff8d70d8d598
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "length0_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_r.ilproj
new file mode 100644
index 0000000000000..6081f38df8629
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
index fde5fe5d56cb7..f543a5f3f9f2d 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'lengthm2'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_d.il b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_d.il
new file mode 100644
index 0000000000000..9b7141b9f5307
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lengthm2_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_d.ilproj
new file mode 100644
index 0000000000000..49d4473a0be29
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
deleted file mode 100644
index 4bc51020eb8a0..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
deleted file mode 100644
index b7c2a3a23bbe4..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_r.il b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_r.il
new file mode 100644
index 0000000000000..7cfc58311930e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lengthm2_r"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_r.ilproj
new file mode 100644
index 0000000000000..76eb608e69fb2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref.il b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
index 39c02e0b1433d..d68cc30510f59 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'selfref'// as "selfref"
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_d.il b/src/tests/JIT/Methodical/Arrays/misc/selfref_d.il
new file mode 100644
index 0000000000000..f5d1390a4c106
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "selfref_il_d"
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
index f7f419cb49bb0..46df98dd75126 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
index 2abc470fa10a9..9cee26de0c4ff 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_r.il b/src/tests/JIT/Methodical/Arrays/misc/selfref_r.il
new file mode 100644
index 0000000000000..7437a7c0f7e17
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "selfref_il_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1.il b/src/tests/JIT/Methodical/Arrays/range/float64_range1.il
index ef3d3deb38a10..148299291c361 100644
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range1.il
@@ -20,7 +20,7 @@
}
-.assembly 'float64_range1'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1_d.il b/src/tests/JIT/Methodical/Arrays/range/float64_range1_d.il
new file mode 100644
index 0000000000000..11894419d9ec7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "float64_range1_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range1_d.ilproj
new file mode 100644
index 0000000000000..e34092e7572f6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range1_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range1_il_d.ilproj
deleted file mode 100644
index bda60b2e55014..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range1_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range1_il_r.ilproj
deleted file mode 100644
index eff56131d84eb..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range1_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1_r.il b/src/tests/JIT/Methodical/Arrays/range/float64_range1_r.il
new file mode 100644
index 0000000000000..017cf38efebaf
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "float64_range1_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range1_r.ilproj
new file mode 100644
index 0000000000000..8ae5f607bd76d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range1_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2.il b/src/tests/JIT/Methodical/Arrays/range/float64_range2.il
index 7c1ca4dc0e7a1..da2002f4bce34 100644
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range2.il
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range2.il
@@ -20,7 +20,7 @@
}
-.assembly 'float64_range2'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2_d.il b/src/tests/JIT/Methodical/Arrays/range/float64_range2_d.il
new file mode 100644
index 0000000000000..37a541ecd9ba3
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "float64_range2_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range2_d.ilproj
new file mode 100644
index 0000000000000..8908b983df92c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range2_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range2_il_d.ilproj
deleted file mode 100644
index cbe4a85f12f0d..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range2_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range2_il_r.ilproj
deleted file mode 100644
index 5398fd8258af2..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range2_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2_r.il b/src/tests/JIT/Methodical/Arrays/range/float64_range2_r.il
new file mode 100644
index 0000000000000..59a758d0f0c23
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "float64_range2_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/float64_range2_r.ilproj
new file mode 100644
index 0000000000000..8ae90c4aaf86f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range2_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0.il b/src/tests/JIT/Methodical/Arrays/range/int32_0.il
index f3ce485ed74b9..9234d39db1b28 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_0'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il
index 0dc3f5e25529e..e4c0d8be6722c 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_0_5a'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_d.il
new file mode 100644
index 0000000000000..35190f5310b83
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_0_5a_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_d.ilproj
new file mode 100644
index 0000000000000..dd975811c3a41
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_il_d.ilproj
deleted file mode 100644
index 09ae6ce783296..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_il_r.ilproj
deleted file mode 100644
index a353f828527ff..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_r.il
new file mode 100644
index 0000000000000..0ab6a9cdae7e2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_0_5a_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_r.ilproj
new file mode 100644
index 0000000000000..9ea86898bccf2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il
index 4a0859658fefb..59c253529d3e6 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_0_5b'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_d.il
new file mode 100644
index 0000000000000..15ced7ba06a6e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_0_5b_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_d.ilproj
new file mode 100644
index 0000000000000..03bd00a28723b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_il_d.ilproj
deleted file mode 100644
index fd3b61bb9ef6c..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_il_r.ilproj
deleted file mode 100644
index 132cc06f43d77..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_r.il
new file mode 100644
index 0000000000000..436668f719499
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_0_5b_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_r.ilproj
new file mode 100644
index 0000000000000..06e55fef7bef6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_d.il
new file mode 100644
index 0000000000000..e92de2d0a6a4e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_0_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_d.ilproj
new file mode 100644
index 0000000000000..9ed9e6f9eefe3
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_il_d.ilproj
deleted file mode 100644
index 30329f08ebc27..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_il_r.ilproj
deleted file mode 100644
index 31edeb0ca5143..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_r.il
new file mode 100644
index 0000000000000..59bbdac11b726
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_0_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_0_r.ilproj
new file mode 100644
index 0000000000000..938b4e5b4cfd5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1.il b/src/tests/JIT/Methodical/Arrays/range/int32_1.il
index 0d313eb45d4a5..37a346d2d81f7 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_1.il
@@ -21,7 +21,7 @@
}
-.assembly 'int32_1'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_1_d.il
new file mode 100644
index 0000000000000..6e832b4db90dc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_1_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_1_d.ilproj
new file mode 100644
index 0000000000000..eab81805c0158
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_1_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_1_il_d.ilproj
deleted file mode 100644
index 3772e571cfbc1..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_1_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_1_il_r.ilproj
deleted file mode 100644
index b3d402f585d8f..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_1_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_1_r.il
new file mode 100644
index 0000000000000..13b6e1aa6f690
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_1_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_1_r.ilproj
new file mode 100644
index 0000000000000..8a4e6a5de50cd
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_1_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1.il b/src/tests/JIT/Methodical/Arrays/range/int32_m1.il
index a5580fa694fc0..9d6e153a5c825 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_m1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_m1.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_m1'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_m1_d.il
new file mode 100644
index 0000000000000..15c638b8597c2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_m1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_m1_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_m1_d.ilproj
new file mode 100644
index 0000000000000..a1cb1c33b890b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_m1_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_m1_il_d.ilproj
deleted file mode 100644
index 08fb4f3297f5a..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_m1_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_m1_il_r.ilproj
deleted file mode 100644
index 0f3caecf0c071..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_m1_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_m1_r.il
new file mode 100644
index 0000000000000..b7663ded3047a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_m1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_m1_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_m1_r.ilproj
new file mode 100644
index 0000000000000..344fc822aff9d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_m1_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il
index d386ed915de79..11de5c3819466 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_neg_range'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_d.il
new file mode 100644
index 0000000000000..5bd50ac4ca838
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_neg_range_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_d.ilproj
new file mode 100644
index 0000000000000..7fc3071d9c665
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_il_d.ilproj
deleted file mode 100644
index cfb8a98a09618..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_il_r.ilproj
deleted file mode 100644
index 1e85486b813c3..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_r.il
new file mode 100644
index 0000000000000..4784162dfeb41
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_neg_range_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_r.ilproj
new file mode 100644
index 0000000000000..d1e9ed78021e6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1.il b/src/tests/JIT/Methodical/Arrays/range/int32_range1.il
index 78660a3d40165..0604f67d7263a 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range1.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_range1'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_range1_d.il
new file mode 100644
index 0000000000000..151e326283120
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_range1_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range1_d.ilproj
new file mode 100644
index 0000000000000..337808f6d4874
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range1_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range1_il_d.ilproj
deleted file mode 100644
index 8aa91e5d812f5..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range1_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range1_il_r.ilproj
deleted file mode 100644
index 03f97fedcaf66..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range1_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_range1_r.il
new file mode 100644
index 0000000000000..3813fdc1b47b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_range1_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range1_r.ilproj
new file mode 100644
index 0000000000000..c5ac004943872
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range1_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2.il b/src/tests/JIT/Methodical/Arrays/range/int32_range2.il
index dac8f8f45b9fc..8ab0b9e8d1daf 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range2.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range2.il
@@ -20,7 +20,7 @@
}
-.assembly 'int32_range2'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2_d.il b/src/tests/JIT/Methodical/Arrays/range/int32_range2_d.il
new file mode 100644
index 0000000000000..f1e2d0545f9f5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_range2_d"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range2_d.ilproj
new file mode 100644
index 0000000000000..e0afee8475f73
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range2_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range2_il_d.ilproj
deleted file mode 100644
index c948799a82b25..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range2_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range2_il_r.ilproj
deleted file mode 100644
index 31420f5afd5ca..0000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range2_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2_r.il b/src/tests/JIT/Methodical/Arrays/range/int32_range2_r.il
new file mode 100644
index 0000000000000..fdd4bc099edc1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "int32_range2_r"
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/int32_range2_r.ilproj
new file mode 100644
index 0000000000000..b5efe58186427
--- /dev/null
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range2_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
index bd9c9b2087608..debdfa3eb5e9e 100644
--- a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
+++ b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-.assembly 'negIndexRngChkElim' {}
+.assembly negIndexRngChkElim_r {}
.assembly extern xunit.core {}
.assembly extern mscorlib{auto}
diff --git a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim_r.ilproj
similarity index 100%
rename from src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim_il_r.ilproj
rename to src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim_r.ilproj
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array.il b/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
index aa58277823c6f..816e4ba6d09b0 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'array' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_array_boxunbox_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/array_d.il
new file mode 100644
index 0000000000000..d37315942448b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_d.ilproj
new file mode 100644
index 0000000000000..44e8714d3fdcc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
deleted file mode 100644
index 02a208431d334..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
deleted file mode 100644
index 5ca46a8bc1a15..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/array_r.il
new file mode 100644
index 0000000000000..a5043c21e974d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_r.ilproj
new file mode 100644
index 0000000000000..4a25595d6438b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il b/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
index dbaca559ab825..7f8d00d55b0e8 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'chain' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_chain_boxunbox_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_d.il
new file mode 100644
index 0000000000000..e4b1b36959b26
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "chain_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_d.ilproj
new file mode 100644
index 0000000000000..c2da4ea344c22
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
deleted file mode 100644
index 460a0f66cac78..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
deleted file mode 100644
index 3f629d1397b1c..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_r.il
new file mode 100644
index 0000000000000..d5c58b2cfefa0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "chain_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_r.ilproj
new file mode 100644
index 0000000000000..5e6e58a347d5c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il b/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
index 2e9140277ed87..bf5307246a588 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'finally' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_finally_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_d.il
new file mode 100644
index 0000000000000..d51a311065d81
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "finally_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_d.ilproj
new file mode 100644
index 0000000000000..5ccf90cab4e93
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
deleted file mode 100644
index 7b75a53474d88..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
deleted file mode 100644
index e5515a562bfe2..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_r.il
new file mode 100644
index 0000000000000..3f84264306085
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "finally_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_r.ilproj
new file mode 100644
index 0000000000000..62ed2ff4c771f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
index 33eec92d30197..d571beb6d2a8c 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'huge_filter' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_huge_filter_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_d.il
new file mode 100644
index 0000000000000..d753d0207411e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_filter_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_d.ilproj
new file mode 100644
index 0000000000000..1bb9e83713779
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
deleted file mode 100644
index 7edd0a5e0908d..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
deleted file mode 100644
index 60ee26c831165..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_r.il
new file mode 100644
index 0000000000000..1e07bb63c8428
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_filter_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_r.ilproj
new file mode 100644
index 0000000000000..90d940f49b571
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il b/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
index 680cb9500e336..d1e9b1ad7586c 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'jump' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_jump_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_d.il
new file mode 100644
index 0000000000000..7735d5b34c0af
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jump_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_d.ilproj
new file mode 100644
index 0000000000000..019b3e2b962b4
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
deleted file mode 100644
index dffe0de0eebf9..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
deleted file mode 100644
index a503dfea831cb..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_r.il
new file mode 100644
index 0000000000000..ff48dce9babba
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jump_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_r.ilproj
new file mode 100644
index 0000000000000..0ef4f05f9674b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local.il b/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
index 646f84004c224..cd4ffe43dded0 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'local' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_local_boxunbox_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/local_d.il
new file mode 100644
index 0000000000000..a7fd458a6f2de
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "local_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_d.ilproj
new file mode 100644
index 0000000000000..6d8dd3f9e7c6c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
deleted file mode 100644
index a0f837e77b7f7..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
deleted file mode 100644
index 70e5d38227994..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/local_r.il
new file mode 100644
index 0000000000000..ed4d61e0adcb0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "local_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_r.ilproj
new file mode 100644
index 0000000000000..1dd2e5e5eb53c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
index 519a13ae8650c..3698cb423c047 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'localloc_boxunbox' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_localloc_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_d.ilproj
new file mode 100644
index 0000000000000..9fe65f397e7eb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
deleted file mode 100644
index 9ead303dbf4e9..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
deleted file mode 100644
index bb256aa51afec..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_r.ilproj
new file mode 100644
index 0000000000000..5e0b82269d9cb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_d.il
new file mode 100644
index 0000000000000..a676e5b3b9399
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "localloc_boxunbox_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_r.il
new file mode 100644
index 0000000000000..706a3c554e398
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "localloc_boxunbox_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il b/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
index a0c676f929a8b..12121d58da80c 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'simple' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_simple_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_d.il
new file mode 100644
index 0000000000000..353e56bb00f49
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "simple_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_d.ilproj
new file mode 100644
index 0000000000000..92307739071db
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
deleted file mode 100644
index 14f90de11ba45..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
deleted file mode 100644
index cbf627bb8599a..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_r.il
new file mode 100644
index 0000000000000..75cedba2cccba
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "simple_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_r.ilproj
new file mode 100644
index 0000000000000..70f1318e99923
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
index 73473f18f70fc..cceffc6e1707e 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
@@ -5,7 +5,7 @@
.assembly extern System.Console { auto }
.assembly extern mscorlib { auto }
-.assembly 'tailcall_boxunbox' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_tailcall_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_d.ilproj
new file mode 100644
index 0000000000000..47fd3b20ebd2b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
deleted file mode 100644
index 016dc7948fef1..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
deleted file mode 100644
index 306a35dc708af..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_r.ilproj
new file mode 100644
index 0000000000000..3a2663c8fa090
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_d.il
new file mode 100644
index 0000000000000..ee63ccc568d22
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tailcall_boxunbox_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_r.il
new file mode 100644
index 0000000000000..d93f58ac26af5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tailcall_boxunbox_r"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try.il b/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
index 4daea08b91f46..829fd13290da0 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'try_boxunbox' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_try_boxunbox
{
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_d.ilproj
new file mode 100644
index 0000000000000..a504e58a9590d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
deleted file mode 100644
index 682ab9d3e4834..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
deleted file mode 100644
index 52ec4c2dd2901..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_r.ilproj
new file mode 100644
index 0000000000000..8d224f8bc263c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_d.il b/src/tests/JIT/Methodical/Boxing/boxunbox/try_d.il
new file mode 100644
index 0000000000000..f1487a5344a78
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try_boxunbox_d"
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_r.il b/src/tests/JIT/Methodical/Boxing/boxunbox/try_r.il
new file mode 100644
index 0000000000000..3275ce59eb7f1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try_boxunbox_r"
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance.il b/src/tests/JIT/Methodical/Boxing/callconv/instance.il
index b320d7d6da829..27ae2fa007b67 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance.il
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'instance'// as "instance"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_d.il b/src/tests/JIT/Methodical/Boxing/callconv/instance_d.il
new file mode 100644
index 0000000000000..ffd2bd41798c3
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "instance_d"
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_d.ilproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_d.ilproj
new file mode 100644
index 0000000000000..0a2983aa572a2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj
deleted file mode 100644
index 4b8a4872d1ba0..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj
deleted file mode 100644
index 98219e692a595..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_r.il b/src/tests/JIT/Methodical/Boxing/callconv/instance_r.il
new file mode 100644
index 0000000000000..90481a4c9d500
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "instance_r"
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_r.ilproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_r.ilproj
new file mode 100644
index 0000000000000..6a6a6f700b358
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo.il b/src/tests/JIT/Methodical/Boxing/functional/fibo.il
index 36a061eec8f0f..2ee9a468eea08 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo.il
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'fibo' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace BoxTest_fibo_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_d.il b/src/tests/JIT/Methodical/Boxing/functional/fibo_d.il
new file mode 100644
index 0000000000000..01a56c9b01783
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fibo_d"
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_d.ilproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_d.ilproj
new file mode 100644
index 0000000000000..ee3c45a8b7933
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj
deleted file mode 100644
index 607f83dcc966f..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj
deleted file mode 100644
index 77fba604765e3..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/functional/fibo_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_r.il b/src/tests/JIT/Methodical/Boxing/functional/fibo_r.il
new file mode 100644
index 0000000000000..821c473ce0963
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fibo_r"
diff --git a/src/tests/JIT/Methodical/Boxing/functional/fibo_r.ilproj b/src/tests/JIT/Methodical/Boxing/functional/fibo_r.ilproj
new file mode 100644
index 0000000000000..a880375cc07f2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/fibo_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin.il b/src/tests/JIT/Methodical/Boxing/functional/sin.il
index 2471fc9e3da27..bfbb21fac6c7f 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin.il
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin.il
@@ -9,7 +9,7 @@
.assembly extern mscorlib
{
}
-.assembly sin
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_d.il b/src/tests/JIT/Methodical/Boxing/functional/sin_d.il
new file mode 100644
index 0000000000000..e6fdee4784296
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sin_d"
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_d.ilproj b/src/tests/JIT/Methodical/Boxing/functional/sin_d.ilproj
new file mode 100644
index 0000000000000..5bf031845f2be
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj
deleted file mode 100644
index d5e79abe75e28..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj
deleted file mode 100644
index 5ebc02f642b02..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/functional/sin_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_r.il b/src/tests/JIT/Methodical/Boxing/functional/sin_r.il
new file mode 100644
index 0000000000000..985f2da1258b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sin_r"
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin_r.ilproj b/src/tests/JIT/Methodical/Boxing/functional/sin_r.ilproj
new file mode 100644
index 0000000000000..53140dd30b7b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc.il b/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
index d03aac9bba036..ab1dae6e2d3e0 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
@@ -6,7 +6,7 @@
.assembly extern System.Threading.Thread { auto }
.assembly extern mscorlib { auto }
-.assembly 'concurgc'// as "concur"
+.assembly ASSEMBLY_NAME// as "concur"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_d.il b/src/tests/JIT/Methodical/Boxing/misc/concurgc_d.il
new file mode 100644
index 0000000000000..0f34749aa99e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "concurgc_d"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/concurgc_d.ilproj
new file mode 100644
index 0000000000000..cec9fcf401296
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc_d.ilproj
@@ -0,0 +1,16 @@
+
+
+ true
+
+ true
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj
deleted file mode 100644
index 0d70ac2692f5d..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_d.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- true
-
- true
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj
deleted file mode 100644
index b7305d641aebe..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- true
-
- true
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_r.il b/src/tests/JIT/Methodical/Boxing/misc/concurgc_r.il
new file mode 100644
index 0000000000000..558d632f0789f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "concurgc_r"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/concurgc_r.ilproj
new file mode 100644
index 0000000000000..89785c8697451
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ true
+
+ true
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum.il b/src/tests/JIT/Methodical/Boxing/misc/enum.il
index 15c7c07d7b877..6b6594c72242d 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/enum.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'enum' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace BoxTest_enum_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_d.il b/src/tests/JIT/Methodical/Boxing/misc/enum_d.il
new file mode 100644
index 0000000000000..49782231cb463
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "enum_d"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/enum_d.ilproj
new file mode 100644
index 0000000000000..799c221394a2d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj
deleted file mode 100644
index 47192ba7c7219..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj
deleted file mode 100644
index 4489380536290..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/enum_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_r.il b/src/tests/JIT/Methodical/Boxing/misc/enum_r.il
new file mode 100644
index 0000000000000..978b99ad5c196
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "enum_r"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/enum_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/enum_r.ilproj
new file mode 100644
index 0000000000000..da49bf115c141
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/enum_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval.il b/src/tests/JIT/Methodical/Boxing/misc/nestval.il
index e97e2314eb985..d788e90c8e2fc 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'nestval' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace BoxTest_nestval_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_d.il b/src/tests/JIT/Methodical/Boxing/misc/nestval_d.il
new file mode 100644
index 0000000000000..193a4545d8aae
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestval_d"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_d.ilproj
new file mode 100644
index 0000000000000..30164288e973f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj
deleted file mode 100644
index cb82717e2929c..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj
deleted file mode 100644
index 200077f4d4740..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/nestval_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_r.il b/src/tests/JIT/Methodical/Boxing/misc/nestval_r.il
new file mode 100644
index 0000000000000..7754f103591d0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestval_r"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/nestval_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/nestval_r.ilproj
new file mode 100644
index 0000000000000..6d3c39f12b173
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/nestval_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump.il b/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
index a9148dff7f184..29ddab21c0e8c 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'tailjump' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace BoxTest_tailjump_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_d.il b/src/tests/JIT/Methodical/Boxing/misc/tailjump_d.il
new file mode 100644
index 0000000000000..929d17ef184e0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tailjump_d"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_d.ilproj
new file mode 100644
index 0000000000000..d452d8d10b35f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj
deleted file mode 100644
index 8fbe24639d318..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj
deleted file mode 100644
index 54d39a17fde5c..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_r.il b/src/tests/JIT/Methodical/Boxing/misc/tailjump_r.il
new file mode 100644
index 0000000000000..3581c5b075cca
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tailjump_r"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/tailjump_r.ilproj
new file mode 100644
index 0000000000000..a87e19cf5a570
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref.il b/src/tests/JIT/Methodical/Boxing/misc/typedref.il
index fc406fa008461..3a56e6b4f6d50 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/typedref.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'typedref' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace BoxTest_typedref_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_d.il b/src/tests/JIT/Methodical/Boxing/misc/typedref_d.il
new file mode 100644
index 0000000000000..67ba5dc2aebf5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "typedref_d"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_d.ilproj
new file mode 100644
index 0000000000000..d48773bb5b60b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj
deleted file mode 100644
index 8726384835cfd..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj
deleted file mode 100644
index 96199a179aea4..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/misc/typedref_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_r.il b/src/tests/JIT/Methodical/Boxing/misc/typedref_r.il
new file mode 100644
index 0000000000000..4809d06881d18
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "typedref_r"
diff --git a/src/tests/JIT/Methodical/Boxing/misc/typedref_r.ilproj b/src/tests/JIT/Methodical/Boxing/misc/typedref_r.ilproj
new file mode 100644
index 0000000000000..50f1e4b94b0b0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/misc/typedref_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault.il b/src/tests/JIT/Methodical/Boxing/seh/fault.il
index 32b2e7a0b1ecf..69c4984749454 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/fault.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'fault'// as "try"
+.assembly ASSEMBLY_NAME// as "try"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_d.il b/src/tests/JIT/Methodical/Boxing/seh/fault_d.il
new file mode 100644
index 0000000000000..431573ef3956e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fault_d"
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_d.ilproj
new file mode 100644
index 0000000000000..74880bb3516ab
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj
deleted file mode 100644
index 8b970c1b5ff5f..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/seh/fault_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj
deleted file mode 100644
index 028b8945f3b31..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/seh/fault_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_r.il b/src/tests/JIT/Methodical/Boxing/seh/fault_r.il
new file mode 100644
index 0000000000000..55062dfea3776
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fault_r"
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/fault_r.ilproj
new file mode 100644
index 0000000000000..65a803407027a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter.il b/src/tests/JIT/Methodical/Boxing/seh/filter.il
index b54dd192e5be9..61477dcc72b27 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/filter.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'filter_seh_Boxing' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace SinCalc_filter_seh_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_d.il b/src/tests/JIT/Methodical/Boxing/seh/filter_d.il
new file mode 100644
index 0000000000000..413612659ce3b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter_seh_Boxing_d"
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_r.il b/src/tests/JIT/Methodical/Boxing/seh/filter_r.il
new file mode 100644
index 0000000000000..b93b1f50813cc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter_seh_Boxing_r"
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_d.ilproj
new file mode 100644
index 0000000000000..e00bbc54bad54
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj
deleted file mode 100644
index 77298a176795d..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj
deleted file mode 100644
index 38dec42451190..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_r.ilproj
new file mode 100644
index 0000000000000..2706a9a7fe68f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/filter_seh_Boxing_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try.il b/src/tests/JIT/Methodical/Boxing/seh/try.il
index 5b35a820ffc2f..9673061ff07c6 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/try.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/try.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
-.assembly 'try_seh' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace SinCalc_try_seh_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_d.il b/src/tests/JIT/Methodical/Boxing/seh/try_d.il
new file mode 100644
index 0000000000000..4607d1e55cc50
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try_seh_d"
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_r.il b/src/tests/JIT/Methodical/Boxing/seh/try_r.il
new file mode 100644
index 0000000000000..c11845b528bf7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "try_seh_r"
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_seh_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/try_seh_d.ilproj
new file mode 100644
index 0000000000000..a504e58a9590d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_seh_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj
deleted file mode 100644
index 682ab9d3e4834..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj
deleted file mode 100644
index d4db351e036d0..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/seh/try_seh_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/seh/try_seh_r.ilproj b/src/tests/JIT/Methodical/Boxing/seh/try_seh_r.ilproj
new file mode 100644
index 0000000000000..7933243ff4cf1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/seh/try_seh_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
index c3b41c0d03f8e..11e08378f3204 100644
--- 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_il_cs' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.assembly extern sinlib_cs
{
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_d.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_d.il
new file mode 100644
index 0000000000000..573e798c1b453
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sin_il_cs_d"
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_r.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_r.il
new file mode 100644
index 0000000000000..9c05333722d5f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sin_il_cs_r"
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
index b6dde1c227f79..c15586d6b15d2 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern legacy library mscorlib { auto }
-.assembly 'sin_il' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.assembly extern sinlib_il
{
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_d.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_d.ilproj
new file mode 100644
index 0000000000000..0ff7f075fb2f9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj
deleted file mode 100644
index 3a6db7e205f0c..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj
deleted file mode 100644
index d04ca7f2a3ba1..0000000000000
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_r.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_r.ilproj
new file mode 100644
index 0000000000000..5496c0f1db3d7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_cs_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_d.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_d.il
new file mode 100644
index 0000000000000..6a22515c7758f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sin_il_il_d"
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj
index 0e7167a55f662..5e9e7cad7f5f2 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj
index dfd817dd92844..565dc61da699e 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_il_r.ilproj
@@ -7,6 +7,7 @@
True
+
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il_r.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_r.il
new file mode 100644
index 0000000000000..61e7676f9861d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sin_il_il_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
index d54d109bc0815..51def48cff1b6 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'conv_i8_i'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_conv_i8_i extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_d.il
new file mode 100644
index 0000000000000..197744287bf68
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_i8_i_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_d.ilproj
new file mode 100644
index 0000000000000..037ad97dde8fc
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj
deleted file mode 100644
index b845edf80abd1..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj
deleted file mode 100644
index e07c64d9dfabf..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_r.il
new file mode 100644
index 0000000000000..c66dbb6e9f325
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_i8_i_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_r.ilproj
new file mode 100644
index 0000000000000..aa54aab8606d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
index 071109f55dd44..e4e10e701e68a 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'conv_i8_u'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_conv_i8_u extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_d.il
new file mode 100644
index 0000000000000..9b46031fb7747
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_i8_u_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_d.ilproj
new file mode 100644
index 0000000000000..15f8792300c86
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj
deleted file mode 100644
index 6695f3f2a64a7..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj
deleted file mode 100644
index 62707228f4b39..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_r.il
new file mode 100644
index 0000000000000..476f43ece692e
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_i8_u_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_r.ilproj
new file mode 100644
index 0000000000000..57ac6e629de2c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
index d694fe892c9dc..cafcfc734a438 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'convovf_i8_i'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_convovf_i8_i extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_d.il
new file mode 100644
index 0000000000000..7c2307ac5f685
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convovf_i8_i_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_d.ilproj
new file mode 100644
index 0000000000000..efe2714f22651
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj
deleted file mode 100644
index d577a1d47d4d5..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj
deleted file mode 100644
index 92bb5fb315cff..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_r.il
new file mode 100644
index 0000000000000..ce5e8dfc67912
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convovf_i8_i_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_r.ilproj
new file mode 100644
index 0000000000000..dd685121cd818
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u.il
index 9b7887321a49f..7ada61671477f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'convovf_i8_u'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_convovf_i8_u extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_d.il
new file mode 100644
index 0000000000000..23a421857a605
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convovf_i8_u_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_d.ilproj
new file mode 100644
index 0000000000000..0a30a9526a328
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj
deleted file mode 100644
index 8681ce11f6a05..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj
deleted file mode 100644
index 7a129a0b0fbe6..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_r.il
new file mode 100644
index 0000000000000..bab65d0a09ee7
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convovf_i8_u_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_r.ilproj
new file mode 100644
index 0000000000000..65e0889e1a2a1
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
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 ac86ee98aedfc..aad4e57b2da25 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
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{ }
-.assembly 'i_array_merge_Target_32BIT'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_d.il
new file mode 100644
index 0000000000000..3e6a913ad6851
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_array_merge_Target_32BIT_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_d.ilproj
new file mode 100644
index 0000000000000..98cda8baa2c28
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj
deleted file mode 100644
index ab8dedc7abcfb..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj
deleted file mode 100644
index c42eeb6ee82fc..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_r.il
new file mode 100644
index 0000000000000..36eebb35c6850
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_array_merge_Target_32BIT_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_r.ilproj
new file mode 100644
index 0000000000000..5e8352b2168c1
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 bae6556aa9b6d..e822131fe483a 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
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{ }
-.assembly 'i_array_merge_Target_64BIT'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_d.il
new file mode 100644
index 0000000000000..fa29ee632fdd4
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_array_merge_Target_64BIT_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_d.ilproj
new file mode 100644
index 0000000000000..c18972a8efa7b
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj
deleted file mode 100644
index 5cdffec9a13fd..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj
deleted file mode 100644
index c310c07eb693b..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_r.il
new file mode 100644
index 0000000000000..95cee45114557
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_array_merge_Target_64BIT_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_r.ilproj
new file mode 100644
index 0000000000000..df0ef9b89c566
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
index 753aef7df13dc..e4ac186e65c7f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
@@ -16,7 +16,7 @@
.assembly extern mscorlib
{
}
-.assembly 'i_box'// as "avg"
+.assembly ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_d.il
new file mode 100644
index 0000000000000..2f142eb7efd37
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_box_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_d.ilproj
new file mode 100644
index 0000000000000..90a3fb551dcdb
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj
deleted file mode 100644
index bdcc662546a33..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj
deleted file mode 100644
index 52e5130f9a393..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_r.il
new file mode 100644
index 0000000000000..f708a8418ff05
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_box_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_r.ilproj
new file mode 100644
index 0000000000000..21d96019f6a37
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
index 21fbf65c3849a..031e5794e7c36 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_conv'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_i_conv extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_d.il
new file mode 100644
index 0000000000000..f98ab0395beed
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_conv_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_d.ilproj
new file mode 100644
index 0000000000000..5baca489a5d17
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj
deleted file mode 100644
index 54590c5ff0255..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj
deleted file mode 100644
index 060f213bddf4d..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_r.il
new file mode 100644
index 0000000000000..862e0f787dde8
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_conv_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_r.ilproj
new file mode 100644
index 0000000000000..b2e56f958acce
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
index 9971186eb65e7..a6d2a6a7d24e6 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_fld'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{ }
.assembly extern xunit.core {}
.namespace Test_i_fld
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_d.il
new file mode 100644
index 0000000000000..f80f3770847c8
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_fld_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_d.ilproj
new file mode 100644
index 0000000000000..c7c8222febb56
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj
deleted file mode 100644
index c49204ec21605..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj
deleted file mode 100644
index 0d83f9b32ec6f..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_r.il
new file mode 100644
index 0000000000000..56ecd92bf0058
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_fld_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_r.ilproj
new file mode 100644
index 0000000000000..5da3a50e2a1af
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
index fae6d4857dd03..52dde93db44c5 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_flood'// as "avg"
+.assembly ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_d.il
new file mode 100644
index 0000000000000..166e1dc5010d6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_flood_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_d.ilproj
new file mode 100644
index 0000000000000..1807f4ba0b395
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj
deleted file mode 100644
index 9301035c4022c..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj
deleted file mode 100644
index 0cd260e87eb4f..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_r.il
new file mode 100644
index 0000000000000..a64ae5573671f
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_flood_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_r.ilproj
new file mode 100644
index 0000000000000..994fe2a1079c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
index 56c04d349d5ef..c239e6ac01cef 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_flow'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_d.il
new file mode 100644
index 0000000000000..0d4e852ec3dc0
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_flow_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_d.ilproj
new file mode 100644
index 0000000000000..c703116e61588
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj
deleted file mode 100644
index cff07f7922db7..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj
deleted file mode 100644
index 7ab811b222e2b..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_r.il
new file mode 100644
index 0000000000000..167aa03b9fa96
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_flow_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_r.ilproj
new file mode 100644
index 0000000000000..89d4d5c88e3c6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
index 355c2d0fd5db5..0a8ae2f7ee7d2 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_prop'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{ }
.assembly extern xunit.core {}
.namespace Test_i_prop
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_d.il
new file mode 100644
index 0000000000000..d9fb07a826bfb
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_prop_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_d.ilproj
new file mode 100644
index 0000000000000..9599aa7be77b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj
deleted file mode 100644
index b239dd45c16e5..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj
deleted file mode 100644
index 7cb0d43c8016c..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_r.il
new file mode 100644
index 0000000000000..10964f3c524af
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_prop_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_r.ilproj
new file mode 100644
index 0000000000000..7c1be48735096
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
index 9bcc4642321e8..f335fdb646f94 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_qsort1'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_d.il
new file mode 100644
index 0000000000000..f18879016c59f
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_qsort1_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_d.ilproj
new file mode 100644
index 0000000000000..189e5776b31fd
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj
deleted file mode 100644
index 626dc2ae38d78..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj
deleted file mode 100644
index b9cddf0ec783a..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_r.il
new file mode 100644
index 0000000000000..15dc14895a888
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_qsort1_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_r.ilproj
new file mode 100644
index 0000000000000..969dabd46a2e9
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
index 7b9a043cca25a..3e3c45a7c449b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_qsort2'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_d.il
new file mode 100644
index 0000000000000..1df7bca4135ee
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_qsort2_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_d.ilproj
new file mode 100644
index 0000000000000..ab49a9d2cf68a
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj
deleted file mode 100644
index a93af1f6b9e38..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj
deleted file mode 100644
index 7987c7a0dd059..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_r.il
new file mode 100644
index 0000000000000..cfc08aa5c846c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_qsort2_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_r.ilproj
new file mode 100644
index 0000000000000..7defa04ac05e6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
index 9cfc829a3a9b7..928008ec938a8 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_ref'// as "avg"
+.assembly ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_d.il
new file mode 100644
index 0000000000000..fe189a8d97068
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_ref_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_d.ilproj
new file mode 100644
index 0000000000000..81a139df73845
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj
deleted file mode 100644
index 5c659e764b5e0..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj
deleted file mode 100644
index 614b6f9bc2729..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_r.il
new file mode 100644
index 0000000000000..2950d72d98480
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_ref_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_r.ilproj
new file mode 100644
index 0000000000000..50e315cbf8faa
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
index ff0410155ad0d..d3159b8b3ee3a 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_seq'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_i_seq extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_d.il
new file mode 100644
index 0000000000000..7565f54aafff5
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_seq_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_d.ilproj
new file mode 100644
index 0000000000000..176a32bf08277
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj
deleted file mode 100644
index ebceab794c221..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj
deleted file mode 100644
index e9a1d646b1955..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_r.il
new file mode 100644
index 0000000000000..7ee98a225f177
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_seq_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_r.ilproj
new file mode 100644
index 0000000000000..637e229bb04fa
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
index 69d5f09b6b751..d46b4677a0176 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i_vfld'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{ }
.assembly extern xunit.core {}
.namespace Test_i_vfld
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_d.il
new file mode 100644
index 0000000000000..d586809edf1ea
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_vfld_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_d.ilproj
new file mode 100644
index 0000000000000..44ce6dbbdb6bf
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj
deleted file mode 100644
index 3328fa7adf718..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj
deleted file mode 100644
index 90bc776fa4c02..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_r.il
new file mode 100644
index 0000000000000..b875894550f60
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i_vfld_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_r.ilproj
new file mode 100644
index 0000000000000..eaf6cd2670e58
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il
index fca5b8311ec7d..bb16197f8b45e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr.il
@@ -10,7 +10,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ptr'
+.assembly ASSEMBLY_NAME
{ }
.namespace Test_ptr
{
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_d.il
new file mode 100644
index 0000000000000..7a115e1b33c9d
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ptr_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_d.ilproj
new file mode 100644
index 0000000000000..869d31968f474
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj
deleted file mode 100644
index 97d11acfdd8db..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj
deleted file mode 100644
index 6f8f33a3ed2ee..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_r.il
new file mode 100644
index 0000000000000..91950d7b5eb57
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ptr_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_r.ilproj
new file mode 100644
index 0000000000000..05d4bc793ab83
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/ptr_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
index 9048a5bf56b17..3762af924f234 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'qperm'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_d.il
new file mode 100644
index 0000000000000..e4885c2db7db7
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "qperm_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_d.ilproj
new file mode 100644
index 0000000000000..dd8bf63fc71b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj
deleted file mode 100644
index b9c17409e043f..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj
deleted file mode 100644
index 38a5b6e00c4d9..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_r.il
new file mode 100644
index 0000000000000..65cf5441c4d93
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "qperm_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_r.ilproj
new file mode 100644
index 0000000000000..870fd7bef6e4d
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
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 23d6491356d91..304880d9c46f6 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
@@ -14,7 +14,7 @@
.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 ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_d.il
new file mode 100644
index 0000000000000..8bcc476e54610
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_32BIT_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_d.ilproj
new file mode 100644
index 0000000000000..74f6d8c27c892
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+ true
+ true
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj
deleted file mode 100644
index ba68bab98a49d..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
- true
- true
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj
deleted file mode 100644
index 01c485a6cbb99..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_r.il
new file mode 100644
index 0000000000000..659011d013314
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_32BIT_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_r.ilproj
new file mode 100644
index 0000000000000..45da4cf4e7ed4
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_32BIT_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
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 69c812a3fd7cf..03351b44f6306 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
@@ -14,7 +14,7 @@
.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 ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_d.il
new file mode 100644
index 0000000000000..0b533f3a22e51
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_64BIT_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_d.ilproj
new file mode 100644
index 0000000000000..a2aec1c7e8f23
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+ true
+ true
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj
deleted file mode 100644
index 49754d19b72c4..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
- true
- true
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj
deleted file mode 100644
index 9095bb7e22bc3..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_r.il
new file mode 100644
index 0000000000000..f9667739c8c47
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_64BIT_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_r.ilproj
new file mode 100644
index 0000000000000..85fa559f4a495
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof_Target_64BIT_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
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 f8575aba8961a..ae78b9bb50966 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
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{ }
-.assembly 'u_array_merge_Target_32BIT'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_d.il
new file mode 100644
index 0000000000000..56f616687ffe7
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_array_merge_Target_32BIT_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_d.ilproj
new file mode 100644
index 0000000000000..79f81c0d895b4
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj
deleted file mode 100644
index 85a5b5be38470..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj
deleted file mode 100644
index de64e5da18c9f..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_r.il
new file mode 100644
index 0000000000000..4874707943663
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_array_merge_Target_32BIT_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_r.ilproj
new file mode 100644
index 0000000000000..f2b6da8c526bc
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 4da56c505da9f..2108e38becf0c 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
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{ }
-.assembly 'u_array_merge_Target_64BIT'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_d.il
new file mode 100644
index 0000000000000..78131e444faed
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_array_merge_Target_64BIT_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_d.ilproj
new file mode 100644
index 0000000000000..a185c76f024fd
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj
deleted file mode 100644
index 63cc7d1ff34f5..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj
deleted file mode 100644
index b39facd158fab..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_r.il
new file mode 100644
index 0000000000000..f540e742c0d53
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_array_merge_Target_64BIT_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_r.ilproj
new file mode 100644
index 0000000000000..24810b8741281
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
index 104db84364fb1..0f397dde9e5cf 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
@@ -16,7 +16,7 @@
.assembly extern mscorlib
{
}
-.assembly 'u_box'// as "avg"
+.assembly ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_d.il
new file mode 100644
index 0000000000000..8b228a8c1aea8
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_box_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_d.ilproj
new file mode 100644
index 0000000000000..23a3f6948af53
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj
deleted file mode 100644
index 421e4847892c7..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj
deleted file mode 100644
index f97fa1960c274..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_r.il
new file mode 100644
index 0000000000000..3f648f0cbc13c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_box_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_r.ilproj
new file mode 100644
index 0000000000000..3505e5f7181b6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
index e5e7233687647..9e8752d0d264c 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_conv'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_u_conv extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_d.il
new file mode 100644
index 0000000000000..93b66af834b02
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_conv_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_d.ilproj
new file mode 100644
index 0000000000000..53a63629997d0
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj
deleted file mode 100644
index ab1f33647fa1a..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj
deleted file mode 100644
index ffa1af315bc25..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_r.il
new file mode 100644
index 0000000000000..e2eb51ccaaf6e
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_conv_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_r.ilproj
new file mode 100644
index 0000000000000..efebeffe56112
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
index 721cd576aff1d..7d30799f23c08 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_fld'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{ }
.assembly extern xunit.core {}
.namespace Test_u_fld
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_d.il
new file mode 100644
index 0000000000000..20e01530fb321
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_fld_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_d.ilproj
new file mode 100644
index 0000000000000..49178a1712e06
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj
deleted file mode 100644
index 7c277859fd8b5..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj
deleted file mode 100644
index 3527dfcbea67a..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_r.il
new file mode 100644
index 0000000000000..cf204c15d072c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_fld_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_r.ilproj
new file mode 100644
index 0000000000000..8e78aa88b2b07
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
index d0962544b91a6..2fade7e5bdfbe 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_flood'// as "avg"
+.assembly ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_d.il
new file mode 100644
index 0000000000000..10ebb15cfeabc
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_flood_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_d.ilproj
new file mode 100644
index 0000000000000..15c70b0e37789
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj
deleted file mode 100644
index 0b2a98541dbb6..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj
deleted file mode 100644
index feb67d80fbff8..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_r.il
new file mode 100644
index 0000000000000..e8a21c8087cc8
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_flood_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_r.ilproj
new file mode 100644
index 0000000000000..d3fca2321de99
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
index 764a9c36d079b..faf999daec138 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_flow'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_d.il
new file mode 100644
index 0000000000000..fc41968bc0a6e
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_flow_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_d.ilproj
new file mode 100644
index 0000000000000..f8261c250e2c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj
deleted file mode 100644
index 55d1aecad76f1..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj
deleted file mode 100644
index eec76e6cef45e..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_r.il
new file mode 100644
index 0000000000000..c1231ae6c8519
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_flow_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_r.ilproj
new file mode 100644
index 0000000000000..8131649061c58
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
index 8878455e02de7..a0251ce79aaf0 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_prop'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{ }
.assembly extern xunit.core {}
.namespace Test_u_prop
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_d.il
new file mode 100644
index 0000000000000..c2ef3426e4083
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_prop_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_d.ilproj
new file mode 100644
index 0000000000000..58e5f1710ace6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj
deleted file mode 100644
index 1c4ffa415e036..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj
deleted file mode 100644
index 0655002d567ab..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_r.il
new file mode 100644
index 0000000000000..c5133143bc167
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_prop_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_r.ilproj
new file mode 100644
index 0000000000000..d3adb6195b6de
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
index a9abcdf2235f8..168117e78c0f2 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_qsort1'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_d.il
new file mode 100644
index 0000000000000..7d42076d9f675
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_qsort1_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_d.ilproj
new file mode 100644
index 0000000000000..a171cd59df140
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj
deleted file mode 100644
index e5a5381afda01..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj
deleted file mode 100644
index 9fe419347239b..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_r.il
new file mode 100644
index 0000000000000..8ef0831dc3eac
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_qsort1_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_r.ilproj
new file mode 100644
index 0000000000000..69e3323d4dcb5
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
index 830b9ea859225..11f12771b1bb5 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_qsort2'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_d.il
new file mode 100644
index 0000000000000..33be6932be184
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_qsort2_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_d.ilproj
new file mode 100644
index 0000000000000..5e1e2e1ec3437
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj
deleted file mode 100644
index 85309e36b9221..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj
deleted file mode 100644
index ed64912a0588a..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_r.il
new file mode 100644
index 0000000000000..5ee00300e935a
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_qsort2_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_r.ilproj
new file mode 100644
index 0000000000000..7eb0cf5281449
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
index 5d1cf0b51cd4d..7f62e5f30a57c 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_ref'// as "avg"
+.assembly ASSEMBLY_NAME// as "avg"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_d.il
new file mode 100644
index 0000000000000..05a6bdcc371bd
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_ref_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_d.ilproj
new file mode 100644
index 0000000000000..c056cb36a8866
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj
deleted file mode 100644
index 7fc8ded3e125f..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj
deleted file mode 100644
index 5d2cd7906bcad..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_r.il
new file mode 100644
index 0000000000000..25f88da76d55f
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_ref_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_r.ilproj
new file mode 100644
index 0000000000000..ec472362b7111
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
index 2ae453039b04a..ace6a9ed86ff0 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_seq'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_u_seq extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_d.il
new file mode 100644
index 0000000000000..c0a241bf53470
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_seq_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_d.ilproj
new file mode 100644
index 0000000000000..ff76106419992
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj
deleted file mode 100644
index 3f4bfe9476c95..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj
deleted file mode 100644
index f7678cd782fb8..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_r.il
new file mode 100644
index 0000000000000..285c0fec75cdd
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_seq_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_r.ilproj
new file mode 100644
index 0000000000000..1e48839d1d1d0
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
index f6cbbed0fb986..67ccccd38fe47 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_vfld'// as "qsort"
+.assembly ASSEMBLY_NAME// as "qsort"
{ }
.assembly extern xunit.core {}
.namespace Test_u_vfld
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_d.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_d.il
new file mode 100644
index 0000000000000..9b5811d1bdf3c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_vfld_d"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_d.ilproj
new file mode 100644
index 0000000000000..aa31ffea925d6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj
deleted file mode 100644
index d4f3059caa2dd..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj
deleted file mode 100644
index b0e0720529c6a..0000000000000
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_r.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_r.il
new file mode 100644
index 0000000000000..13ca8ef8602f6
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_vfld_r"
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_r.ilproj
new file mode 100644
index 0000000000000..0233b77d269cb
--- /dev/null
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX.il b/src/tests/JIT/Methodical/FPtrunc/convX.il
index 3c285e1e8ac62..223f656b742e7 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convX.il
+++ b/src/tests/JIT/Methodical/FPtrunc/convX.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
-.assembly convX {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.class public auto ansi beforefieldinit convX
extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_d.il b/src/tests/JIT/Methodical/FPtrunc/convX_d.il
new file mode 100644
index 0000000000000..2cecc40e85725
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convX_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convX_d"
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convX_d.ilproj
new file mode 100644
index 0000000000000..846ef667e4f42
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convX_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj
deleted file mode 100644
index 9f81e53de1a9a..0000000000000
--- a/src/tests/JIT/Methodical/FPtrunc/convX_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj
deleted file mode 100644
index ad542d9e2896e..0000000000000
--- a/src/tests/JIT/Methodical/FPtrunc/convX_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_r.il b/src/tests/JIT/Methodical/FPtrunc/convX_r.il
new file mode 100644
index 0000000000000..877ef87002d77
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convX_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convX_r"
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convX_r.ilproj
new file mode 100644
index 0000000000000..f3ad35ad62f89
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convX_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d.il b/src/tests/JIT/Methodical/FPtrunc/convr4d.il
index 7b23f90c2d37a..ad5ef749e1833 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4d.il
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'convr4d' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.class public sealed VT extends [mscorlib]System.ValueType
{
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_d.il b/src/tests/JIT/Methodical/FPtrunc/convr4d_d.il
new file mode 100644
index 0000000000000..1327e4ceedb62
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convr4d_d"
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr4d_d.ilproj
new file mode 100644
index 0000000000000..27808c50bbda8
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
deleted file mode 100644
index 04ca6e5577eac..0000000000000
--- a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
deleted file mode 100644
index 20f1e6e43d86a..0000000000000
--- a/src/tests/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_r.il b/src/tests/JIT/Methodical/FPtrunc/convr4d_r.il
new file mode 100644
index 0000000000000..aea1b424941f4
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convr4d_r"
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr4d_r.ilproj
new file mode 100644
index 0000000000000..d7bdeaa5305f9
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d.il b/src/tests/JIT/Methodical/FPtrunc/convr8d.il
index 4905a0539f8c3..43907aebfea99 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr8d.il
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly convr8d {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.class public sealed VT extends [mscorlib]System.ValueType
{
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_d.il b/src/tests/JIT/Methodical/FPtrunc/convr8d_d.il
new file mode 100644
index 0000000000000..e41869ef399ae
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convr8d_d"
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr8d_d.ilproj
new file mode 100644
index 0000000000000..d3a2e16b71bad
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
deleted file mode 100644
index 7fc42adc07f0b..0000000000000
--- a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
deleted file mode 100644
index 21acebc285a85..0000000000000
--- a/src/tests/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_r.il b/src/tests/JIT/Methodical/FPtrunc/convr8d_r.il
new file mode 100644
index 0000000000000..5d8f92068af9d
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "convr8d_r"
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr8d_r.ilproj b/src/tests/JIT/Methodical/FPtrunc/convr8d_r.ilproj
new file mode 100644
index 0000000000000..fd3c26cde49cf
--- /dev/null
+++ b/src/tests/JIT/Methodical/FPtrunc/convr8d_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b.il b/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
index 43d81c4d3bd32..ea2a052ed2199 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly '25param1b'{}
+.assembly ASSEMBLY_NAME{}
.assembly extern xunit.core {}
.namespace Test_25param1b_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_d.il b/src/tests/JIT/Methodical/Invoke/25params/25param1b_d.il
new file mode 100644
index 0000000000000..239d36c09afe2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param1b_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1b_d.ilproj
new file mode 100644
index 0000000000000..e4e0a63e81c45
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
deleted file mode 100644
index 05e5909e631b2..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
deleted file mode 100644
index 8a8d7574da628..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_r.il b/src/tests/JIT/Methodical/Invoke/25params/25param1b_r.il
new file mode 100644
index 0000000000000..36321ab7dbfd6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param1b_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1b_r.ilproj
new file mode 100644
index 0000000000000..feb93ea588507
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c.il b/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
index b1d9aa5177749..188009898e058 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly '25param1c'{}
+.assembly ASSEMBLY_NAME{}
.assembly extern xunit.core {}
.namespace Test_25param1c_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_d.il b/src/tests/JIT/Methodical/Invoke/25params/25param1c_d.il
new file mode 100644
index 0000000000000..1920b262d22ed
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param1c_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1c_d.ilproj
new file mode 100644
index 0000000000000..955eb422639d8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
deleted file mode 100644
index 2763cbe25e0f6..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
deleted file mode 100644
index 69b2332fef023..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_r.il b/src/tests/JIT/Methodical/Invoke/25params/25param1c_r.il
new file mode 100644
index 0000000000000..5e26dcdf9f7fb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param1c_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param1c_r.ilproj
new file mode 100644
index 0000000000000..bc6a4c398998c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b.il b/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
index 0a0fe9f965876..1ced274177d9e 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
-.assembly '25param2b'{}
+.assembly ASSEMBLY_NAME{}
.assembly extern xunit.core {}
.namespace Test_25param2b_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_d.il b/src/tests/JIT/Methodical/Invoke/25params/25param2b_d.il
new file mode 100644
index 0000000000000..29b54916251f1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param2b_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2b_d.ilproj
new file mode 100644
index 0000000000000..453a72e280481
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
deleted file mode 100644
index 405ad121491bf..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
deleted file mode 100644
index aa2d07aa5aa86..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_r.il b/src/tests/JIT/Methodical/Invoke/25params/25param2b_r.il
new file mode 100644
index 0000000000000..0ff797721531e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param2b_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2b_r.ilproj
new file mode 100644
index 0000000000000..3467757a7503a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c.il b/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
index 33f8812bad775..487051041126b 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
-.assembly '25param2c' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_25param2c_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_d.il b/src/tests/JIT/Methodical/Invoke/25params/25param2c_d.il
new file mode 100644
index 0000000000000..db2cc559d10a6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param2c_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2c_d.ilproj
new file mode 100644
index 0000000000000..9ede264327af5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
deleted file mode 100644
index b4bff83a181af..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
deleted file mode 100644
index fc75df9d2a529..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_r.il b/src/tests/JIT/Methodical/Invoke/25params/25param2c_r.il
new file mode 100644
index 0000000000000..2c12308317851
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param2c_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param2c_r.ilproj
new file mode 100644
index 0000000000000..edd1a3bc38644
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b.il b/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
index d5161bddc7cc6..43344ba7bc738 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly '25param3b' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_25param3b_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_d.il b/src/tests/JIT/Methodical/Invoke/25params/25param3b_d.il
new file mode 100644
index 0000000000000..6b0b9ac10b3f5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param3b_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3b_d.ilproj
new file mode 100644
index 0000000000000..be1fb26c50804
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
deleted file mode 100644
index a46fb470b7e4c..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
deleted file mode 100644
index 7faff4e8ff5ed..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_r.il b/src/tests/JIT/Methodical/Invoke/25params/25param3b_r.il
new file mode 100644
index 0000000000000..e0fa8a379447e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param3b_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3b_r.ilproj
new file mode 100644
index 0000000000000..921b13b423597
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c.il b/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
index 176150abdda40..4baa1bcb756a8 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly '25param3c' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_25param3c_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_d.il b/src/tests/JIT/Methodical/Invoke/25params/25param3c_d.il
new file mode 100644
index 0000000000000..395d3e3801f13
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param3c_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3c_d.ilproj
new file mode 100644
index 0000000000000..2c77d2ddbd80a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
deleted file mode 100644
index c3dca6b8f5187..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
deleted file mode 100644
index 0b4ef8e2a7b71..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_r.il b/src/tests/JIT/Methodical/Invoke/25params/25param3c_r.il
new file mode 100644
index 0000000000000..4dc648dbe7907
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25param3c_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25param3c_r.ilproj
new file mode 100644
index 0000000000000..d10efd1311b77
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
index 0e7d2e4cd25ec..06fe8263fa7a2 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly '25paramMixed' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_25paramMixed_il
{
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_d.il b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_d.il
new file mode 100644
index 0000000000000..cd4fa9e9e06b4
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25paramMixed_d'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_d.ilproj
new file mode 100644
index 0000000000000..42661978da60e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
deleted file mode 100644
index 33afd667e58dc..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
deleted file mode 100644
index 234bdde3e927e..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_r.il b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_r.il
new file mode 100644
index 0000000000000..f39f40c6756d8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'25paramMixed_r'"
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_r.ilproj b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_r.ilproj
new file mode 100644
index 0000000000000..2b47ea376f8b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
index e37ddbbd88e6e..1af1978372b6e 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfault'// as "catchfault"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_d.il
new file mode 100644
index 0000000000000..c837f567f473a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfault_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_d.ilproj
new file mode 100644
index 0000000000000..3f846e0bfc24e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj
deleted file mode 100644
index ca5e92493ff08..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj
deleted file mode 100644
index bdd2007edc1a1..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
index 8c0d00e88d57f..c4629a4884126 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfault_jmp'// as "catchfault_tail"
+.assembly ASSEMBLY_NAME// as "catchfault_tail"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_d.il
new file mode 100644
index 0000000000000..849960136bf56
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfault_jmp_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_d.ilproj
new file mode 100644
index 0000000000000..6532cf4a2e803
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj
deleted file mode 100644
index d2e6d4a7e31a7..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj
deleted file mode 100644
index 187b036ff6025..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_r.il
new file mode 100644
index 0000000000000..79ec64a925a1f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfault_jmp_r"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_r.ilproj
new file mode 100644
index 0000000000000..49e8b4f41ad7e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_r.il
new file mode 100644
index 0000000000000..a9b1c520c46b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfault_r"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_r.ilproj
new file mode 100644
index 0000000000000..0cbe55c2f1c6c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
index a8ca798cc8454..e91659602f771 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfault_tail'// as "catchfault_tail"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_d.il
new file mode 100644
index 0000000000000..ece5ec0689ba7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfault_tail_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_d.ilproj
new file mode 100644
index 0000000000000..6af4e8d962efe
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj
deleted file mode 100644
index b240fa535078b..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj
deleted file mode 100644
index 2d986eaabfb95..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_r.il
new file mode 100644
index 0000000000000..8bc4fc1c9bd4a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfault_tail_r"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_r.ilproj
new file mode 100644
index 0000000000000..4c6ba790f3c5f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
index 671b1e34db678..50b1510ed75f0 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfinally_ind'// as "catchfinally"
+.assembly ASSEMBLY_NAME// as "catchfinally"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_d.il
new file mode 100644
index 0000000000000..a52d719b7f26e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_ind_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_d.ilproj
new file mode 100644
index 0000000000000..4696005b2c777
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj
deleted file mode 100644
index 8e730207c6f36..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj
deleted file mode 100644
index 3462692e205c6..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_r.il
new file mode 100644
index 0000000000000..4897bb09fad2e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_ind_r"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_r.ilproj
new file mode 100644
index 0000000000000..37a92a80738ce
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
index 277174aa88d6e..4b9025710f260 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfinally_jmp'// as "catchfinally_tail"
+.assembly ASSEMBLY_NAME// as "catchfinally_tail"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_d.il
new file mode 100644
index 0000000000000..75580ae6f5841
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_jmp_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_d.ilproj
new file mode 100644
index 0000000000000..8a225be3045c0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj
deleted file mode 100644
index 7cdebfed27dfc..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj
deleted file mode 100644
index 84e316caa6392..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_r.il
new file mode 100644
index 0000000000000..19d09c0f0c2ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_jmp_r"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_r.ilproj
new file mode 100644
index 0000000000000..837fde6799100
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
index 7049cd2ec466a..b8e70d2fd051e 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfinally_jmpind'// as "catchfinally_tail"
+.assembly ASSEMBLY_NAME// as "catchfinally_tail"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_d.il
new file mode 100644
index 0000000000000..2c6ee36ac8273
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_jmpind_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_d.ilproj
new file mode 100644
index 0000000000000..de9e59a82114b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj
deleted file mode 100644
index 07d1426de66fa..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj
deleted file mode 100644
index 5756507f72ab7..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_r.il
new file mode 100644
index 0000000000000..8c259b80363e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_jmpind_r"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_r.ilproj
new file mode 100644
index 0000000000000..46f7626649c63
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
index 09e193a780bda..2ff74c265ee4e 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'catchfinally_tail'// as "catchfinally_tail"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.il
new file mode 100644
index 0000000000000..d87b25d48f727
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_tail_il_d"
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj
index f6403ea25c76c..ee8b00a57281b 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj
index caabfa4864050..d15e829a2c7ac 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.il
new file mode 100644
index 0000000000000..52f261fc3ac85
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfinally_tail_il_r"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1.il b/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
index 21a5acbbadd41..3a41e6757b5ae 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'test1'// as "test1"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.il b/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.il
new file mode 100644
index 0000000000000..fd1f2fb7155a6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test1_il_d"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj
index fc0cef7fa7aba..c4c714005cc9d 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj
index 814b17a9df6f7..9a8871075a068 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.il b/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.il
new file mode 100644
index 0000000000000..9b21f1387d097
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test1_il_r"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2.il b/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
index 3f7ffe40724cf..417e263448942 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'test2'// as "test1"
+.assembly ASSEMBLY_NAME// as "test1"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_d.il b/src/tests/JIT/Methodical/Invoke/callvirt/test2_d.il
new file mode 100644
index 0000000000000..cf30daf190015
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test2_d"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test2_d.ilproj
new file mode 100644
index 0000000000000..1dbc21203df9a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj
deleted file mode 100644
index 373632372f3c9..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj
deleted file mode 100644
index 80f092e3de6f1..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_r.il b/src/tests/JIT/Methodical/Invoke/callvirt/test2_r.il
new file mode 100644
index 0000000000000..4d641bd523300
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test2_r"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test2_r.ilproj
new file mode 100644
index 0000000000000..aea06d98ce508
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3.il b/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
index e721a1bdfd036..039f3bf006332 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'test3'// as "test3"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_d.il b/src/tests/JIT/Methodical/Invoke/callvirt/test3_d.il
new file mode 100644
index 0000000000000..2cade668de494
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test3_d"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test3_d.ilproj
new file mode 100644
index 0000000000000..d5e5e97e46ba5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj
deleted file mode 100644
index f54861b761e50..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj
deleted file mode 100644
index a218259d10468..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_r.il b/src/tests/JIT/Methodical/Invoke/callvirt/test3_r.il
new file mode 100644
index 0000000000000..acceef863f0b9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test3_r"
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3_r.ilproj b/src/tests/JIT/Methodical/Invoke/callvirt/test3_r.ilproj
new file mode 100644
index 0000000000000..1ff69bb827e19
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
index 05dc0b3330e18..fc7bcbda1f8bb 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'val_cctor'// as "val_cctor"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_d.il b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_d.il
new file mode 100644
index 0000000000000..12893b6dc0a45
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "val_cctor_d"
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_d.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_d.ilproj
new file mode 100644
index 0000000000000..f34e4d5cb59ba
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj
deleted file mode 100644
index 1eb00865ab92e..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj
deleted file mode 100644
index 547d43b806d36..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_r.il b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_r.il
new file mode 100644
index 0000000000000..af85779ed3fd0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "val_cctor_r"
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_r.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_r.ilproj
new file mode 100644
index 0000000000000..c22e16f3ef96c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
index c832373a99046..4443215f99a13 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'val_ctor_newobj'// as "ctor"
+.assembly ASSEMBLY_NAME// as "ctor"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_d.il b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_d.il
new file mode 100644
index 0000000000000..656778c332429
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "val_ctor_newobj_d"
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_d.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_d.ilproj
new file mode 100644
index 0000000000000..207e0e4c8954f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj
deleted file mode 100644
index e43dfcb9e40d8..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj
deleted file mode 100644
index d479dcd2ee547..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_r.il b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_r.il
new file mode 100644
index 0000000000000..bd84fed029e64
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "val_ctor_newobj_r"
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_r.ilproj b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_r.ilproj
new file mode 100644
index 0000000000000..c08166174483f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1.il b/src/tests/JIT/Methodical/Invoke/deep/deep1.il
index e53c07ecf18ea..8b939242a6b83 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1.il
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'deep1'// as "deep"
+.assembly ASSEMBLY_NAME// as "deep"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_d.il b/src/tests/JIT/Methodical/Invoke/deep/deep1_d.il
new file mode 100644
index 0000000000000..1a2fe01c0ae32
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep1_d"
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_d.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep1_d.ilproj
new file mode 100644
index 0000000000000..5de7c43034e7d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj
deleted file mode 100644
index a3661a0ca954f..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj
deleted file mode 100644
index 27e8b3c2f9a2c..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_r.il b/src/tests/JIT/Methodical/Invoke/deep/deep1_r.il
new file mode 100644
index 0000000000000..a94eb346caff3
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep1_r"
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1_r.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep1_r.ilproj
new file mode 100644
index 0000000000000..dcd6761526c42
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2.il b/src/tests/JIT/Methodical/Invoke/deep/deep2.il
index 0b632a4c8abb0..5ebdf30fa01b0 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2.il
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'deep2'// as "deep"
+.assembly ASSEMBLY_NAME// as "deep"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_d.il b/src/tests/JIT/Methodical/Invoke/deep/deep2_d.il
new file mode 100644
index 0000000000000..cdd115a1d8aaa
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep2_d"
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_d.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep2_d.ilproj
new file mode 100644
index 0000000000000..3dfa100b48cb8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj
deleted file mode 100644
index 6cba3d5516723..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj
deleted file mode 100644
index 3671956baf13b..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_r.il b/src/tests/JIT/Methodical/Invoke/deep/deep2_r.il
new file mode 100644
index 0000000000000..3407a35c3b590
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep2_r"
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2_r.ilproj b/src/tests/JIT/Methodical/Invoke/deep/deep2_r.ilproj
new file mode 100644
index 0000000000000..ab97a9dfd8c2b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
index a8433c597f20b..645931f77c1ac 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ftn_t'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_d.il b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_d.il
new file mode 100644
index 0000000000000..2467ec3057801
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ftn_t_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_d.ilproj
new file mode 100644
index 0000000000000..75e4e5a7a89d1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj
deleted file mode 100644
index b7c02cf48c01a..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj
deleted file mode 100644
index d881ea1a8de31..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_r.il b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_r.il
new file mode 100644
index 0000000000000..7de90e70a7746
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ftn_t_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_r.ilproj
new file mode 100644
index 0000000000000..e551a859ad0fb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
index d915ef9eb2d02..aaf2487d29dbc 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'instftn'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_d.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_d.il
new file mode 100644
index 0000000000000..19975b16f0e8f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "instftn_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_d.ilproj
new file mode 100644
index 0000000000000..7baa67a95c6bc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj
deleted file mode 100644
index 97d094fbe99b5..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj
deleted file mode 100644
index fea2acbab0cfa..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_r.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_r.il
new file mode 100644
index 0000000000000..fb50c8797a0f2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "instftn_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_r.ilproj
new file mode 100644
index 0000000000000..0b58843f38d0e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
index bd8f3f84036a9..b906aa9bec306 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'instftn_t'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_d.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_d.il
new file mode 100644
index 0000000000000..5e5106f0ad82c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "instftn_t_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_d.ilproj
new file mode 100644
index 0000000000000..28b144fcd143c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj
deleted file mode 100644
index 6e67d48237a04..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj
deleted file mode 100644
index 5e7478b0b6916..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_r.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_r.il
new file mode 100644
index 0000000000000..76a7b9ffa88ba
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "instftn_t_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_r.ilproj
new file mode 100644
index 0000000000000..f797bc4579a7f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
index c181f727186bd..c8d9c9968d801 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'recurse_calli'// as "recurse"
+.assembly ASSEMBLY_NAME// as "recurse"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_d.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_d.il
new file mode 100644
index 0000000000000..5c9d5efd03836
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_calli_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_d.ilproj
new file mode 100644
index 0000000000000..79a80c92c20b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj
deleted file mode 100644
index 633029673cb75..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj
deleted file mode 100644
index 8d1c349dc37bb..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_r.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_r.il
new file mode 100644
index 0000000000000..509af3ece7b3b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_calli_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_r.ilproj
new file mode 100644
index 0000000000000..54ec4ae93fc0e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
index 3be6a3f9406fa..58448f959ea0a 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'recurse_jmp'// as "recurse"
+.assembly ASSEMBLY_NAME// as "recurse"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_d.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_d.il
new file mode 100644
index 0000000000000..da18c2d774dcb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_jmp_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_d.ilproj
new file mode 100644
index 0000000000000..7a835c6cb4bae
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj
deleted file mode 100644
index 3210433111ce5..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj
deleted file mode 100644
index aaba4c370b072..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_r.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_r.il
new file mode 100644
index 0000000000000..edae5d65c2468
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_jmp_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_r.ilproj
new file mode 100644
index 0000000000000..7b5c25a509a77
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
index 33a63f8229cba..4046d9bada437 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'recurse_jmpi'// as "recurse"
+.assembly ASSEMBLY_NAME// as "recurse"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_d.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_d.il
new file mode 100644
index 0000000000000..cbee1a0b914b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_jmpi_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_d.ilproj
new file mode 100644
index 0000000000000..d75e9a3613558
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj
deleted file mode 100644
index dfb063df1917f..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj
deleted file mode 100644
index b2179e61e9fb4..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_r.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_r.il
new file mode 100644
index 0000000000000..d2f4c79c812da
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_jmpi_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_r.ilproj
new file mode 100644
index 0000000000000..f32c604ce624a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
index b9f4221fcc2f3..10b87b4a3d9f8 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'recurse_tail_call'// as "recurse"
+.assembly ASSEMBLY_NAME// as "recurse"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_d.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_d.il
new file mode 100644
index 0000000000000..7866d8f3491a5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_tail_call_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_d.ilproj
new file mode 100644
index 0000000000000..974f81e78e898
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj
deleted file mode 100644
index fcec29ef2e64e..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj
deleted file mode 100644
index 7fbde58d5f1fe..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_r.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_r.il
new file mode 100644
index 0000000000000..7ac391a4aa74a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_tail_call_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_r.ilproj
new file mode 100644
index 0000000000000..7c4fae8490ed2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
index 002136a722e0e..f9bce1eaf1201 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'recurse_tail_calli'// as "recurse"
+.assembly ASSEMBLY_NAME// as "recurse"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_d.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_d.il
new file mode 100644
index 0000000000000..2ad452135fb72
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_tail_calli_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_d.ilproj
new file mode 100644
index 0000000000000..67be68a3f7700
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj
deleted file mode 100644
index 7474aaad4a1d5..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj
deleted file mode 100644
index 1a0d9c9411e96..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_r.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_r.il
new file mode 100644
index 0000000000000..d2debc7ca15ca
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_tail_calli_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_r.ilproj
new file mode 100644
index 0000000000000..beb4bbbff3058
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
index 825729dcc2276..99dc5fa57483c 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'valftn'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_d.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_d.il
new file mode 100644
index 0000000000000..4de1dbb76ff20
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "valftn_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_d.ilproj
new file mode 100644
index 0000000000000..72278eb2e354f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj
deleted file mode 100644
index 204b654d3ba98..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj
deleted file mode 100644
index 6a68e7746cf44..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_r.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_r.il
new file mode 100644
index 0000000000000..3f8835604a728
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "valftn_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_r.ilproj
new file mode 100644
index 0000000000000..09bb83549b59b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
index 95c77d21f02b3..a93e4656bdd2a 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'valftn_t'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_d.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_d.il
new file mode 100644
index 0000000000000..a5c920f046a86
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "valftn_t_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_d.ilproj
new file mode 100644
index 0000000000000..bbcccbb1e0e95
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj
deleted file mode 100644
index 6aaa23e433393..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj
deleted file mode 100644
index 0230f4f46febe..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_r.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_r.il
new file mode 100644
index 0000000000000..f1e6d61f609bb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "valftn_t_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_r.ilproj
new file mode 100644
index 0000000000000..605f7af5e08e6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
index b896bc33e3d7f..8cd530c8f35f9 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'virtftn'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_d.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_d.il
new file mode 100644
index 0000000000000..0982654e8d579
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "virtftn_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_d.ilproj
new file mode 100644
index 0000000000000..4dc1f30709464
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj
deleted file mode 100644
index cc631d948366d..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj
deleted file mode 100644
index 2a02cd83f09ab..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_r.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_r.il
new file mode 100644
index 0000000000000..b556fb9bad52f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "virtftn_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_r.ilproj
new file mode 100644
index 0000000000000..f9d9f7341c1c2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
index 46a832b7b8ad8..3df2ad91c7e04 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'virtftn_t'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_d.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_d.il
new file mode 100644
index 0000000000000..77d43c4d734a3
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "virtftn_t_d"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_d.ilproj
new file mode 100644
index 0000000000000..282551ab14114
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj
deleted file mode 100644
index 0299e44265c3d..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj
deleted file mode 100644
index 64f8b561a9fea..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_r.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_r.il
new file mode 100644
index 0000000000000..d68e4445d4c88
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "virtftn_t_r"
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_r.ilproj b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_r.ilproj
new file mode 100644
index 0000000000000..b8108bf567314
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4.il b/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
index 5fbe9c9ee8fc0..4c0b2c684ad2f 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'fr4'// as "fr4"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_d.il b/src/tests/JIT/Methodical/Invoke/implicit/fr4_d.il
new file mode 100644
index 0000000000000..7de2778e28788
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fr4_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr4_d.ilproj
new file mode 100644
index 0000000000000..1a7bdb0b1709f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj
deleted file mode 100644
index e7397cd571426..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj
deleted file mode 100644
index e9b0707d3993f..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_r.il b/src/tests/JIT/Methodical/Invoke/implicit/fr4_r.il
new file mode 100644
index 0000000000000..739738e6ec1c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fr4_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr4_r.ilproj
new file mode 100644
index 0000000000000..438b6f557a57b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8.il b/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
index f2cedeb50eb91..f97ecaaabe43e 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'fr8'// as "fr4"
+.assembly ASSEMBLY_NAME// as "fr4"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_d.il b/src/tests/JIT/Methodical/Invoke/implicit/fr8_d.il
new file mode 100644
index 0000000000000..a4cf42521da3f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fr8_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr8_d.ilproj
new file mode 100644
index 0000000000000..0bff0f9e3b9ac
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj
deleted file mode 100644
index 86ba6e51d4177..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj
deleted file mode 100644
index f9bebd2ff1f1b..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_r.il b/src/tests/JIT/Methodical/Invoke/implicit/fr8_r.il
new file mode 100644
index 0000000000000..2969bf8fc4a5a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "fr8_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/fr8_r.ilproj
new file mode 100644
index 0000000000000..4ea086703c14e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
index cf945d3828e9e..89894cb22ff82 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
@@ -17,7 +17,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i4i1'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_d.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_d.il
new file mode 100644
index 0000000000000..4f9165792a32b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4i1_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_d.ilproj
new file mode 100644
index 0000000000000..d600afab3de89
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj
deleted file mode 100644
index b7850b8d8bec5..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj
deleted file mode 100644
index 0c508aae8eba7..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_r.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_r.il
new file mode 100644
index 0000000000000..85f4e165f13a5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4i1_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_r.ilproj
new file mode 100644
index 0000000000000..97e0422231e61
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
index d7acf0994fa96..edae379afa6fd 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
@@ -17,7 +17,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i4i2'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_d.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_d.il
new file mode 100644
index 0000000000000..5d20fd4f69ebd
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4i2_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_d.ilproj
new file mode 100644
index 0000000000000..20ceb0b831813
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj
deleted file mode 100644
index c0a32ad643902..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj
deleted file mode 100644
index b0dbdd3c39bb1..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_r.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_r.il
new file mode 100644
index 0000000000000..4c15a3586372f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4i2_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_r.ilproj
new file mode 100644
index 0000000000000..975bd8e568832
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
index 552310481cc6a..06eb1d1ea0a81 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
@@ -17,7 +17,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i4u1'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_d.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_d.il
new file mode 100644
index 0000000000000..d333b05a1ea8d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4u1_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_d.ilproj
new file mode 100644
index 0000000000000..212df2f1183e6
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj
deleted file mode 100644
index 7cdf32699f6fe..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj
deleted file mode 100644
index d22c814e1e359..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_r.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_r.il
new file mode 100644
index 0000000000000..89e092a8d3edd
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4u1_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_r.ilproj
new file mode 100644
index 0000000000000..fa50fef45b979
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
index c6c0912025734..4a6a99e774b16 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i4u2'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_d.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_d.il
new file mode 100644
index 0000000000000..f72d32fba150d
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4u2_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_d.ilproj
new file mode 100644
index 0000000000000..dc8296f13693c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj
deleted file mode 100644
index b7a7aa719ff13..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj
deleted file mode 100644
index 6bfbb3b017e4a..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_r.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_r.il
new file mode 100644
index 0000000000000..267d430d48dd9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4u2_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_r.ilproj
new file mode 100644
index 0000000000000..1be349f21e113
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
index fb170f807c508..d3857e24f82cf 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i4u4'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_d.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_d.il
new file mode 100644
index 0000000000000..d951967ac3fac
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4u4_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_d.ilproj
new file mode 100644
index 0000000000000..2dd579705d9c0
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj
deleted file mode 100644
index 412f892a09fa3..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj
deleted file mode 100644
index 87923b3a6ba44..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_r.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_r.il
new file mode 100644
index 0000000000000..ecd3ce9686afe
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i4u4_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_r.ilproj
new file mode 100644
index 0000000000000..cb6662007f15e
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il b/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
index b06702c520f6d..62628366402ee 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'i8u8'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_d.il b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_d.il
new file mode 100644
index 0000000000000..dead46d1f01eb
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i8u8_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_d.ilproj
new file mode 100644
index 0000000000000..8f874a3320911
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj
deleted file mode 100644
index ade0fbdb6af51..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj
deleted file mode 100644
index 8aab3d10217a5..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_r.il b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_r.il
new file mode 100644
index 0000000000000..8a4f0c5dd174c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "i8u8_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_r.ilproj
new file mode 100644
index 0000000000000..fc4b78fc6d520
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1.il b/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
index ff58b7bb1d6b1..cf60133cc41be 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ii1'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_d.il b/src/tests/JIT/Methodical/Invoke/implicit/ii1_d.il
new file mode 100644
index 0000000000000..a3fc721035a95
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ii1_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii1_d.ilproj
new file mode 100644
index 0000000000000..2137b6f80c64a
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj
deleted file mode 100644
index e28f11170cad3..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj
deleted file mode 100644
index 71051a6d21652..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_r.il b/src/tests/JIT/Methodical/Invoke/implicit/ii1_r.il
new file mode 100644
index 0000000000000..711bd893af107
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ii1_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii1_r.ilproj
new file mode 100644
index 0000000000000..650cc6949f7b9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2.il b/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
index f9be11852e29b..0ebfe4a91ba87 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ii2'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_d.il b/src/tests/JIT/Methodical/Invoke/implicit/ii2_d.il
new file mode 100644
index 0000000000000..a9a070f31e401
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ii2_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii2_d.ilproj
new file mode 100644
index 0000000000000..49352044d8c63
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj
deleted file mode 100644
index 6c26e0dd0f8b6..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj
deleted file mode 100644
index 6ab4e029932aa..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_r.il b/src/tests/JIT/Methodical/Invoke/implicit/ii2_r.il
new file mode 100644
index 0000000000000..3fca9637018f1
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ii2_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii2_r.ilproj
new file mode 100644
index 0000000000000..833366864fc3f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4.il b/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
index c12a398d342d7..95453daf3e0ce 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ii4'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_d.il b/src/tests/JIT/Methodical/Invoke/implicit/ii4_d.il
new file mode 100644
index 0000000000000..5fbfcb901e4c7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ii4_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii4_d.ilproj
new file mode 100644
index 0000000000000..a65d846bab3d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj
deleted file mode 100644
index 3afc5c20d7319..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj
deleted file mode 100644
index 74ca866aef120..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_r.il b/src/tests/JIT/Methodical/Invoke/implicit/ii4_r.il
new file mode 100644
index 0000000000000..7bbe6fbbff024
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ii4_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/ii4_r.ilproj
new file mode 100644
index 0000000000000..a3a57f0aecbae
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1.il b/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
index 5b2c9f4c0c673..fe8377a6aa372 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
@@ -17,7 +17,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'iu1'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_d.il b/src/tests/JIT/Methodical/Invoke/implicit/iu1_d.il
new file mode 100644
index 0000000000000..87bd61d1b3187
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iu1_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu1_d.ilproj
new file mode 100644
index 0000000000000..c229a523c0c43
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj
deleted file mode 100644
index 69ba95d14bd8a..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj
deleted file mode 100644
index 0411635612c6b..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_r.il b/src/tests/JIT/Methodical/Invoke/implicit/iu1_r.il
new file mode 100644
index 0000000000000..7b45352a4cd2c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iu1_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu1_r.ilproj
new file mode 100644
index 0000000000000..362a1cf44246c
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2.il b/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
index aa1dede658372..922e6e75dd4f6 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'iu2'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_d.il b/src/tests/JIT/Methodical/Invoke/implicit/iu2_d.il
new file mode 100644
index 0000000000000..fab4e534780d2
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iu2_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu2_d.ilproj
new file mode 100644
index 0000000000000..e64e14651e2e7
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj
deleted file mode 100644
index 05e8ba4f96117..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj
deleted file mode 100644
index 6a4b1b3d39006..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_r.il b/src/tests/JIT/Methodical/Invoke/implicit/iu2_r.il
new file mode 100644
index 0000000000000..464b209524463
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iu2_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu2_r.ilproj
new file mode 100644
index 0000000000000..b72d4fa5a7129
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4.il b/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
index 2cafc17b554b1..bc6952d60b3a6 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'iu4'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_d.il b/src/tests/JIT/Methodical/Invoke/implicit/iu4_d.il
new file mode 100644
index 0000000000000..a4bd84a41ffd5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iu4_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu4_d.ilproj
new file mode 100644
index 0000000000000..00b825cbad1d5
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj
deleted file mode 100644
index 4e19e42c60fc1..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj
deleted file mode 100644
index 19e07afbb7a3f..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_r.il b/src/tests/JIT/Methodical/Invoke/implicit/iu4_r.il
new file mode 100644
index 0000000000000..da0e7e4ecc4ed
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iu4_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/iu4_r.ilproj
new file mode 100644
index 0000000000000..ba85b401c341f
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref.il b/src/tests/JIT/Methodical/Invoke/implicit/objref.il
index 8c7ef69138661..b355bb219c8ab 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'objref'// as "objref"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_d.il b/src/tests/JIT/Methodical/Invoke/implicit/objref_d.il
new file mode 100644
index 0000000000000..4e67b5574f298
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "objref_d"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/objref_d.ilproj
new file mode 100644
index 0000000000000..324db8bed5d5b
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj
deleted file mode 100644
index a80d834a63403..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj
deleted file mode 100644
index 337684d6c874e..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_r.il b/src/tests/JIT/Methodical/Invoke/implicit/objref_r.il
new file mode 100644
index 0000000000000..fec7a7ac77f84
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "objref_r"
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref_r.ilproj b/src/tests/JIT/Methodical/Invoke/implicit/objref_r.ilproj
new file mode 100644
index 0000000000000..ff46e14032d47
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il
index 86afc19892c82..af3d6cfb1b237 100644
--- a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly thisnull
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.il b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.il
new file mode 100644
index 0000000000000..25c9fec3af4b9
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "thisnull_d"
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.ilproj
new file mode 100644
index 0000000000000..1a022fc10c143
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj
deleted file mode 100644
index 9303653ee50be..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj
deleted file mode 100644
index 8cc6fac650ba8..0000000000000
--- a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.il b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.il
new file mode 100644
index 0000000000000..62169da1806dc
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "thisnull_r"
diff --git a/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.ilproj b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.ilproj
new file mode 100644
index 0000000000000..66af2b95fce13
--- /dev/null
+++ b/src/tests/JIT/Methodical/Invoke/thiscall/thisnull_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/comp32.il b/src/tests/JIT/Methodical/NaN/comp32.il
index 6d0a3a421222b..81c3a326bbbff 100644
--- a/src/tests/JIT/Methodical/NaN/comp32.il
+++ b/src/tests/JIT/Methodical/NaN/comp32.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly comp32 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_comp32_NaN_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/NaN/comp32_d.il b/src/tests/JIT/Methodical/NaN/comp32_d.il
new file mode 100644
index 0000000000000..3f80601bc92ff
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp32_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "comp32_d"
diff --git a/src/tests/JIT/Methodical/NaN/comp32_d.ilproj b/src/tests/JIT/Methodical/NaN/comp32_d.ilproj
new file mode 100644
index 0000000000000..4243f133d860b
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp32_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj b/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj
deleted file mode 100644
index b00ea9c173eea..0000000000000
--- a/src/tests/JIT/Methodical/NaN/comp32_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj b/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj
deleted file mode 100644
index afdf384577c7d..0000000000000
--- a/src/tests/JIT/Methodical/NaN/comp32_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/comp32_r.il b/src/tests/JIT/Methodical/NaN/comp32_r.il
new file mode 100644
index 0000000000000..dedbd6098ccc9
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp32_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "comp32_r"
diff --git a/src/tests/JIT/Methodical/NaN/comp32_r.ilproj b/src/tests/JIT/Methodical/NaN/comp32_r.ilproj
new file mode 100644
index 0000000000000..30b86ea9ab08b
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp32_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/comp64.il b/src/tests/JIT/Methodical/NaN/comp64.il
index feaa6169d1adf..ff5a1629865e6 100644
--- a/src/tests/JIT/Methodical/NaN/comp64.il
+++ b/src/tests/JIT/Methodical/NaN/comp64.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly comp64 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_comp64_NaN_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/NaN/comp64_d.il b/src/tests/JIT/Methodical/NaN/comp64_d.il
new file mode 100644
index 0000000000000..f50ecf94f2c1f
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp64_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "comp64_d"
diff --git a/src/tests/JIT/Methodical/NaN/comp64_d.ilproj b/src/tests/JIT/Methodical/NaN/comp64_d.ilproj
new file mode 100644
index 0000000000000..f198c1190adc3
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp64_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj b/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj
deleted file mode 100644
index ad78f62807781..0000000000000
--- a/src/tests/JIT/Methodical/NaN/comp64_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj b/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj
deleted file mode 100644
index a31dd4cddca35..0000000000000
--- a/src/tests/JIT/Methodical/NaN/comp64_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/comp64_r.il b/src/tests/JIT/Methodical/NaN/comp64_r.il
new file mode 100644
index 0000000000000..5557ff0c5a2ad
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp64_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "comp64_r"
diff --git a/src/tests/JIT/Methodical/NaN/comp64_r.ilproj b/src/tests/JIT/Methodical/NaN/comp64_r.ilproj
new file mode 100644
index 0000000000000..a82bc1e9d7650
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/comp64_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/cond32.il b/src/tests/JIT/Methodical/NaN/cond32.il
index a73cfb187d823..b4ed3e13128c5 100644
--- a/src/tests/JIT/Methodical/NaN/cond32.il
+++ b/src/tests/JIT/Methodical/NaN/cond32.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly cond32 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_cond32_NaN_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/NaN/cond32_d.il b/src/tests/JIT/Methodical/NaN/cond32_d.il
new file mode 100644
index 0000000000000..10fcce0fddf50
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond32_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cond32_d"
diff --git a/src/tests/JIT/Methodical/NaN/cond32_d.ilproj b/src/tests/JIT/Methodical/NaN/cond32_d.ilproj
new file mode 100644
index 0000000000000..1b1587a50f41a
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond32_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj b/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj
deleted file mode 100644
index 8db5c2ef6b712..0000000000000
--- a/src/tests/JIT/Methodical/NaN/cond32_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj b/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj
deleted file mode 100644
index cf80067fbf819..0000000000000
--- a/src/tests/JIT/Methodical/NaN/cond32_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/cond32_r.il b/src/tests/JIT/Methodical/NaN/cond32_r.il
new file mode 100644
index 0000000000000..9df1ed1d8593a
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond32_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cond32_r"
diff --git a/src/tests/JIT/Methodical/NaN/cond32_r.ilproj b/src/tests/JIT/Methodical/NaN/cond32_r.ilproj
new file mode 100644
index 0000000000000..1fb7b1172b9e1
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond32_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/cond64.il b/src/tests/JIT/Methodical/NaN/cond64.il
index 1acb530bfa296..c61d7b3482efd 100644
--- a/src/tests/JIT/Methodical/NaN/cond64.il
+++ b/src/tests/JIT/Methodical/NaN/cond64.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly cond64 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_cond64_NaN_il {
.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/NaN/cond64_d.il b/src/tests/JIT/Methodical/NaN/cond64_d.il
new file mode 100644
index 0000000000000..969a1a7bb36ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond64_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cond64_d"
diff --git a/src/tests/JIT/Methodical/NaN/cond64_d.ilproj b/src/tests/JIT/Methodical/NaN/cond64_d.ilproj
new file mode 100644
index 0000000000000..be3575bdf5f8a
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond64_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj b/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj
deleted file mode 100644
index de5bee187933b..0000000000000
--- a/src/tests/JIT/Methodical/NaN/cond64_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj b/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj
deleted file mode 100644
index b818c6eeb8644..0000000000000
--- a/src/tests/JIT/Methodical/NaN/cond64_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/cond64_r.il b/src/tests/JIT/Methodical/NaN/cond64_r.il
new file mode 100644
index 0000000000000..4f1bc8607cc8c
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond64_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cond64_r"
diff --git a/src/tests/JIT/Methodical/NaN/cond64_r.ilproj b/src/tests/JIT/Methodical/NaN/cond64_r.ilproj
new file mode 100644
index 0000000000000..b57ae0c6eda58
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/cond64_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il b/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
index 4d17c057bdc0e..c59e7fb0e5153 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
@@ -12,7 +12,7 @@
.assembly extern mscorlib
{
}
-.assembly intrinsic_nonf
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_d.il b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_d.il
new file mode 100644
index 0000000000000..3b941d322ee94
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "intrinsic_nonf_d"
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_d.ilproj b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_d.ilproj
new file mode 100644
index 0000000000000..b8e52b496e80c
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
deleted file mode 100644
index 474e40eed35cb..0000000000000
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
deleted file mode 100644
index a63303bba5ea8..0000000000000
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_r.il b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_r.il
new file mode 100644
index 0000000000000..683287bcd5bf0
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "intrinsic_nonf_r"
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf_r.ilproj b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_r.ilproj
new file mode 100644
index 0000000000000..08940b4f5440d
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv.il b/src/tests/JIT/Methodical/NaN/r4NaNconv.il
index 4f7ae8bc35de7..318a3b3665ecf 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv.il
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'r4NaNconv' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_r4NaNconv
{
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_d.il b/src/tests/JIT/Methodical/NaN/r4NaNconv_d.il
new file mode 100644
index 0000000000000..2c170489136a6
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "r4NaNconv_d"
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_d.ilproj b/src/tests/JIT/Methodical/NaN/r4NaNconv_d.ilproj
new file mode 100644
index 0000000000000..75e2ecbcdc16e
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj b/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj
deleted file mode 100644
index 7c1c4bc63d95f..0000000000000
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj b/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj
deleted file mode 100644
index 285c2adeb9353..0000000000000
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_r.il b/src/tests/JIT/Methodical/NaN/r4NaNconv_r.il
new file mode 100644
index 0000000000000..1ae4b975d8d0c
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "r4NaNconv_r"
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv_r.ilproj b/src/tests/JIT/Methodical/NaN/r4NaNconv_r.ilproj
new file mode 100644
index 0000000000000..b38582faf454a
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv.il b/src/tests/JIT/Methodical/NaN/r8NaNconv.il
index 4cfc156cd3cc6..c7018240c7146 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv.il
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'r8NaNconv' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_r8NaNconv
{
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_d.il b/src/tests/JIT/Methodical/NaN/r8NaNconv_d.il
new file mode 100644
index 0000000000000..3dee277401565
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "r8NaNconv_d"
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_d.ilproj b/src/tests/JIT/Methodical/NaN/r8NaNconv_d.ilproj
new file mode 100644
index 0000000000000..3989fd4dffe88
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj b/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj
deleted file mode 100644
index 3142de5708088..0000000000000
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj b/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj
deleted file mode 100644
index 7961c0b8fbf98..0000000000000
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_r.il b/src/tests/JIT/Methodical/NaN/r8NaNconv_r.il
new file mode 100644
index 0000000000000..39cb4d60a3973
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "r8NaNconv_r"
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv_r.ilproj b/src/tests/JIT/Methodical/NaN/r8NaNconv_r.ilproj
new file mode 100644
index 0000000000000..324ddecd9d613
--- /dev/null
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa.il b/src/tests/JIT/Methodical/VT/callconv/aa.il
index b95764bee9b98..3de47f3a67f09 100644
--- a/src/tests/JIT/Methodical/VT/callconv/aa.il
+++ b/src/tests/JIT/Methodical/VT/callconv/aa.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'aa' // as "call"
+.assembly ASSEMBLY_NAME // as "call"
{
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_d.il b/src/tests/JIT/Methodical/VT/callconv/aa_d.il
new file mode 100644
index 0000000000000..62137d0d4c3bf
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/aa_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "aa_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/aa_d.ilproj
new file mode 100644
index 0000000000000..1716c5712c462
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/aa_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj
deleted file mode 100644
index 15dda50797e8b..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/aa_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj
deleted file mode 100644
index d0e2d4d442459..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/aa_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_r.il b/src/tests/JIT/Methodical/VT/callconv/aa_r.il
new file mode 100644
index 0000000000000..b1017c76be86e
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/aa_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "aa_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/aa_r.ilproj
new file mode 100644
index 0000000000000..435305642b67c
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/aa_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli.il b/src/tests/JIT/Methodical/VT/callconv/calli.il
index 4ddade7ae1399..5bf0ffa415b3d 100644
--- a/src/tests/JIT/Methodical/VT/callconv/calli.il
+++ b/src/tests/JIT/Methodical/VT/callconv/calli.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'calli' // as "call"
+.assembly ASSEMBLY_NAME // as "call"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_d.il b/src/tests/JIT/Methodical/VT/callconv/calli_d.il
new file mode 100644
index 0000000000000..3b97fdd86da23
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/calli_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "calli_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/calli_d.ilproj
new file mode 100644
index 0000000000000..6add70da81293
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/calli_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj
deleted file mode 100644
index ef0ee85003be3..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/calli_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj
deleted file mode 100644
index 6e0e1cc8e4cba..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/calli_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_r.il b/src/tests/JIT/Methodical/VT/callconv/calli_r.il
new file mode 100644
index 0000000000000..42fa3caf34c76
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/calli_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "calli_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/calli_r.ilproj
new file mode 100644
index 0000000000000..eb2314bed8d2a
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/calli_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd.il b/src/tests/JIT/Methodical/VT/callconv/dd.il
index d0b0515e485bb..55546eef62778 100644
--- a/src/tests/JIT/Methodical/VT/callconv/dd.il
+++ b/src/tests/JIT/Methodical/VT/callconv/dd.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'dd' // as "call"
+.assembly ASSEMBLY_NAME // as "call"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_d.il b/src/tests/JIT/Methodical/VT/callconv/dd_d.il
new file mode 100644
index 0000000000000..41bda4659ff1e
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/dd_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "dd_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/dd_d.ilproj
new file mode 100644
index 0000000000000..4a55135db00c9
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/dd_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj
deleted file mode 100644
index ecc44205c2e73..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/dd_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj
deleted file mode 100644
index 34d953eb496ef..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/dd_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_r.il b/src/tests/JIT/Methodical/VT/callconv/dd_r.il
new file mode 100644
index 0000000000000..9d988a300fd78
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/dd_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "dd_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/dd_r.ilproj
new file mode 100644
index 0000000000000..fb2a497844593
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/dd_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee.il b/src/tests/JIT/Methodical/VT/callconv/ee.il
index 4320997b5aa41..896cd559d60ec 100644
--- a/src/tests/JIT/Methodical/VT/callconv/ee.il
+++ b/src/tests/JIT/Methodical/VT/callconv/ee.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ee' // as "call"
+.assembly ASSEMBLY_NAME // as "call"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_d.il b/src/tests/JIT/Methodical/VT/callconv/ee_d.il
new file mode 100644
index 0000000000000..b86fb446748bf
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/ee_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ee_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/ee_d.ilproj
new file mode 100644
index 0000000000000..b9c9883312bc4
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/ee_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj
deleted file mode 100644
index 668c7e5573dd9..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/ee_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj
deleted file mode 100644
index fe94e802cfe29..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/ee_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_r.il b/src/tests/JIT/Methodical/VT/callconv/ee_r.il
new file mode 100644
index 0000000000000..4c7f658c9c7b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/ee_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ee_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/ee_r.ilproj
new file mode 100644
index 0000000000000..06a44becd33c2
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/ee_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1.il b/src/tests/JIT/Methodical/VT/callconv/jumper1.il
index 1503dbfe930b0..47a87be7e2687 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'jumper1' // as "jumper"
+.assembly ASSEMBLY_NAME // as "jumper"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_d.il b/src/tests/JIT/Methodical/VT/callconv/jumper1_d.il
new file mode 100644
index 0000000000000..1414f480b4c1c
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper1_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper1_d.ilproj
new file mode 100644
index 0000000000000..24fc863f6fac9
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj
deleted file mode 100644
index 4f2ff6e8923da..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj
deleted file mode 100644
index 11a1d099dc857..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_r.il b/src/tests/JIT/Methodical/VT/callconv/jumper1_r.il
new file mode 100644
index 0000000000000..92e0472e10caf
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper1_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper1_r.ilproj
new file mode 100644
index 0000000000000..261548604cf61
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2.il b/src/tests/JIT/Methodical/VT/callconv/jumper2.il
index 08676cf06cecd..b48e72bbc93ba 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'jumper2' // as "jumper"
+.assembly ASSEMBLY_NAME // as "jumper"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_d.il b/src/tests/JIT/Methodical/VT/callconv/jumper2_d.il
new file mode 100644
index 0000000000000..169871f1534cf
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper2_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper2_d.ilproj
new file mode 100644
index 0000000000000..b1b9c5e151309
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj
deleted file mode 100644
index 6c79d35f05f2e..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj
deleted file mode 100644
index 1905d9ae0e78f..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_r.il b/src/tests/JIT/Methodical/VT/callconv/jumper2_r.il
new file mode 100644
index 0000000000000..210043faa144f
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper2_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper2_r.ilproj
new file mode 100644
index 0000000000000..20c916aadf16d
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3.il b/src/tests/JIT/Methodical/VT/callconv/jumper3.il
index 457fc296aba4d..cc34832e92942 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'jumper3' // as "jumper"
+.assembly ASSEMBLY_NAME // as "jumper"
{
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_d.il b/src/tests/JIT/Methodical/VT/callconv/jumper3_d.il
new file mode 100644
index 0000000000000..920a522c74f82
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper3_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper3_d.ilproj
new file mode 100644
index 0000000000000..be46fffaec389
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj
deleted file mode 100644
index 2d20752a9fd84..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj
deleted file mode 100644
index 3f300649e67be..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_r.il b/src/tests/JIT/Methodical/VT/callconv/jumper3_r.il
new file mode 100644
index 0000000000000..435ddd7400669
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper3_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper3_r.ilproj
new file mode 100644
index 0000000000000..28a4ae9b5b280
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4.il b/src/tests/JIT/Methodical/VT/callconv/jumper4.il
index 46fc0a5ae7f30..a2b30bb5f0062 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'jumper4' // as "jumper"
+.assembly ASSEMBLY_NAME // as "jumper"
{
//This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
//[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_d.il b/src/tests/JIT/Methodical/VT/callconv/jumper4_d.il
new file mode 100644
index 0000000000000..5305b8cd9a12e
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper4_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper4_d.ilproj
new file mode 100644
index 0000000000000..6065f80219339
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj
deleted file mode 100644
index 9483c80f9e811..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj
deleted file mode 100644
index 252995ab83f4e..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_r.il b/src/tests/JIT/Methodical/VT/callconv/jumper4_r.il
new file mode 100644
index 0000000000000..279dbfaa68304
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper4_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper4_r.ilproj
new file mode 100644
index 0000000000000..be684f31b3e94
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5.il b/src/tests/JIT/Methodical/VT/callconv/jumper5.il
index 49f3905884624..fd6043067d1a5 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'jumper5' // as "jumper"
+.assembly ASSEMBLY_NAME // as "jumper"
{
//This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
//[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_d.il b/src/tests/JIT/Methodical/VT/callconv/jumper5_d.il
new file mode 100644
index 0000000000000..5f99f283d1207
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper5_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper5_d.ilproj
new file mode 100644
index 0000000000000..7329466155fa1
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj
deleted file mode 100644
index 4055e4da0f5f9..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj
deleted file mode 100644
index 3f98a3af46f63..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_r.il b/src/tests/JIT/Methodical/VT/callconv/jumper5_r.il
new file mode 100644
index 0000000000000..3482e0405b318
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumper5_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumper5_r.ilproj
new file mode 100644
index 0000000000000..544cfca18ace0
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1.il b/src/tests/JIT/Methodical/VT/callconv/jumps1.il
index 2478c4b5d850c..d1faed94e62ac 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1.il
@@ -15,7 +15,7 @@
.assembly extern mscorlib
{
}
-.assembly 'jumps1' // as "jumps"
+.assembly ASSEMBLY_NAME // as "jumps"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_d.il b/src/tests/JIT/Methodical/VT/callconv/jumps1_d.il
new file mode 100644
index 0000000000000..1995635fb1a9e
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps1_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps1_d.ilproj
new file mode 100644
index 0000000000000..ba7769cae68b9
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj
deleted file mode 100644
index 1c30d58ec8a3a..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj
deleted file mode 100644
index a6c0bf55d720b..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_r.il b/src/tests/JIT/Methodical/VT/callconv/jumps1_r.il
new file mode 100644
index 0000000000000..8a39ec2fdb2b6
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps1_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps1_r.ilproj
new file mode 100644
index 0000000000000..0a28f8f144201
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2.il b/src/tests/JIT/Methodical/VT/callconv/jumps2.il
index 897e8fe153b0e..a7b4a91b77584 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2.il
@@ -16,7 +16,7 @@
{
}
-.assembly 'jumps2' // as "jumps"
+.assembly ASSEMBLY_NAME // as "jumps"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_d.il b/src/tests/JIT/Methodical/VT/callconv/jumps2_d.il
new file mode 100644
index 0000000000000..0dd862f9e1d39
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps2_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps2_d.ilproj
new file mode 100644
index 0000000000000..407ace8279b71
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj
deleted file mode 100644
index 46f9e078f7cd6..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj
deleted file mode 100644
index c5dad2b426914..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_r.il b/src/tests/JIT/Methodical/VT/callconv/jumps2_r.il
new file mode 100644
index 0000000000000..41fbae66cf735
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps2_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps2_r.ilproj
new file mode 100644
index 0000000000000..b357d36ae4733
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3.il b/src/tests/JIT/Methodical/VT/callconv/jumps3.il
index d8b55659af526..616a637f026ce 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3.il
@@ -15,7 +15,7 @@
.assembly extern mscorlib
{
}
-.assembly 'jumps3' // as "jumps"
+.assembly ASSEMBLY_NAME // as "jumps"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_d.il b/src/tests/JIT/Methodical/VT/callconv/jumps3_d.il
new file mode 100644
index 0000000000000..443f091259a38
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps3_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps3_d.ilproj
new file mode 100644
index 0000000000000..6759848de4765
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj
deleted file mode 100644
index fd72449c3b4c3..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj
deleted file mode 100644
index 5bd981c0c8498..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_r.il b/src/tests/JIT/Methodical/VT/callconv/jumps3_r.il
new file mode 100644
index 0000000000000..5ea70b98ce0ba
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps3_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps3_r.ilproj
new file mode 100644
index 0000000000000..b3ee8f47e17a6
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4.il b/src/tests/JIT/Methodical/VT/callconv/jumps4.il
index e3684b3da0876..cb43a5c88fba4 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'jumps4' // as "jumps"
+.assembly ASSEMBLY_NAME // as "jumps"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_d.il b/src/tests/JIT/Methodical/VT/callconv/jumps4_d.il
new file mode 100644
index 0000000000000..13b460a212f0d
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps4_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps4_d.ilproj
new file mode 100644
index 0000000000000..76086dfaa62fa
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj
deleted file mode 100644
index ebfa7fef8e74f..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj
deleted file mode 100644
index 43479a96f16e8..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_r.il b/src/tests/JIT/Methodical/VT/callconv/jumps4_r.il
new file mode 100644
index 0000000000000..501c7b7bc264b
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps4_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps4_r.ilproj
new file mode 100644
index 0000000000000..ec9e085b80bc3
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5.il b/src/tests/JIT/Methodical/VT/callconv/jumps5.il
index 04f559e5ce10d..9a863b078974d 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5.il
@@ -15,7 +15,7 @@
.assembly extern mscorlib
{
}
-.assembly 'jumps5' // as "jumps"
+.assembly ASSEMBLY_NAME // as "jumps"
{
}
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_d.il b/src/tests/JIT/Methodical/VT/callconv/jumps5_d.il
new file mode 100644
index 0000000000000..72b7ad7cebc23
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps5_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps5_d.ilproj
new file mode 100644
index 0000000000000..566fca9473283
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj
deleted file mode 100644
index a02fde9597d25..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj
deleted file mode 100644
index 0ec9f07ee9cab..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_r.il b/src/tests/JIT/Methodical/VT/callconv/jumps5_r.il
new file mode 100644
index 0000000000000..e49a207ffcd4e
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jumps5_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/jumps5_r.ilproj
new file mode 100644
index 0000000000000..94fe9a04e0fdc
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret.il b/src/tests/JIT/Methodical/VT/callconv/vtret.il
index 29ac2a856d09a..fcd0eab433f36 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret.il
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly vtret // as "vtret"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2.il b/src/tests/JIT/Methodical/VT/callconv/vtret2.il
index 1048deefd5455..00050abebe1cd 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'vtret2' // as "vtret"
+.assembly ASSEMBLY_NAME // as "vtret"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_d.il b/src/tests/JIT/Methodical/VT/callconv/vtret2_d.il
new file mode 100644
index 0000000000000..6c82385e1839d
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "vtret2_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret2_d.ilproj
new file mode 100644
index 0000000000000..e96435c912147
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj
deleted file mode 100644
index 25c4593fa9487..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj
deleted file mode 100644
index ec1f9a25c1890..0000000000000
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_r.il b/src/tests/JIT/Methodical/VT/callconv/vtret2_r.il
new file mode 100644
index 0000000000000..4e6f60a2de33f
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "vtret2_r"
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret2_r.ilproj
new file mode 100644
index 0000000000000..43b04d591204a
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_d.il b/src/tests/JIT/Methodical/VT/callconv/vtret_d.il
new file mode 100644
index 0000000000000..ff4363591e0a2
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "vtret_il_d"
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj
index 64192876c112c..bdae0e1c3c1df 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj b/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj
index 969614b0522f5..a40bd4c4aab74 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret_r.il b/src/tests/JIT/Methodical/VT/callconv/vtret_r.il
new file mode 100644
index 0000000000000..6ec3786f1d519
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "vtret_il_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/han3.il b/src/tests/JIT/Methodical/VT/etc/han3.il
index 404ba028dd151..c3a1b1e03fec3 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3.il
@@ -9,7 +9,7 @@
.assembly extern mscorlib
{
}
-.assembly han3 // as "han3"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor.il b/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
index 8ca8d518da84f..5f2b278edf878 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
@@ -9,7 +9,7 @@
.assembly extern mscorlib
{
}
-.assembly han3_ctor // as "han3_ctor"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.il b/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.il
new file mode 100644
index 0000000000000..8cf34beb6ac2f
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "han3_ctor_il_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj
index 5e1f0397a3d65..a4e805581b596 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj
index 962018010817a..17cb4c1524293 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.il b/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.il
new file mode 100644
index 0000000000000..8767855942cba
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "han3_ctor_il_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_d.il b/src/tests/JIT/Methodical/VT/etc/han3_d.il
new file mode 100644
index 0000000000000..2167d7568a9c4
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/han3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "han3_il_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj
index c62219c70c211..bc8858afd8181 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj
index a1ae04145b5d6..7ac9fba67ab51 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_r.il b/src/tests/JIT/Methodical/VT/etc/han3_r.il
new file mode 100644
index 0000000000000..de98b7e3b81e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/han3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "han3_il_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref.il b/src/tests/JIT/Methodical/VT/etc/han3_ref.il
index 89bb495f72961..628654f71819c 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref.il
@@ -9,7 +9,7 @@
.assembly extern mscorlib
{
}
-.assembly han3_ref // as "han3_ref"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_d.il b/src/tests/JIT/Methodical/VT/etc/han3_ref_d.il
new file mode 100644
index 0000000000000..5ca0b8dcbe827
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "han3_ref_il_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj
index f4fd0fce85d5f..d68e8ffabecbd 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj
index 6a2f862cad977..07897a1ebc2c7 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref_r.il b/src/tests/JIT/Methodical/VT/etc/han3_ref_r.il
new file mode 100644
index 0000000000000..eaecc939a4ee0
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "han3_ref_il_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi.il b/src/tests/JIT/Methodical/VT/etc/hanoi.il
index 891f02b2a1ba2..07b2b425e9664 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi.il
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi.il
@@ -9,7 +9,7 @@
.assembly extern mscorlib
{
}
-.assembly hanoi // as "hanoi"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2.il b/src/tests/JIT/Methodical/VT/etc/hanoi2.il
index 49bd6eacf53b2..1a6ec33d3f041 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2.il
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2.il
@@ -9,7 +9,7 @@
.assembly extern mscorlib
{
}
-.assembly 'hanoi2' // as "hanoi"
+.assembly ASSEMBLY_NAME // as "hanoi"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_d.il b/src/tests/JIT/Methodical/VT/etc/hanoi2_d.il
new file mode 100644
index 0000000000000..0c7c4a61daf18
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "hanoi2_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_d.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi2_d.ilproj
new file mode 100644
index 0000000000000..7371d5c7a53bb
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj
deleted file mode 100644
index 18cbb1ca9be0c..0000000000000
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj
deleted file mode 100644
index 7d8a15903c6f4..0000000000000
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_r.il b/src/tests/JIT/Methodical/VT/etc/hanoi2_r.il
new file mode 100644
index 0000000000000..a3485725d9b1b
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "hanoi2_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2_r.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi2_r.ilproj
new file mode 100644
index 0000000000000..cf61c2e69eec2
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_d.il b/src/tests/JIT/Methodical/VT/etc/hanoi_d.il
new file mode 100644
index 0000000000000..c97caaeed7fa6
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "hanoi_il_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj
index 55cff3e634dc4..b0695c0dade65 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj
index c3342b771fbcf..85a8967dc5713 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi_r.il b/src/tests/JIT/Methodical/VT/etc/hanoi_r.il
new file mode 100644
index 0000000000000..ab9d6e62fd09d
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "hanoi_il_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/knight.il b/src/tests/JIT/Methodical/VT/etc/knight.il
index cc14b49deb949..fba50f1d3401f 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight.il
+++ b/src/tests/JIT/Methodical/VT/etc/knight.il
@@ -12,7 +12,7 @@
.assembly extern mscorlib
{
}
-.assembly knight
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_d.il b/src/tests/JIT/Methodical/VT/etc/knight_d.il
new file mode 100644
index 0000000000000..02adb3e7a0cf0
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/knight_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "knight_il_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj
index 6f8fb916c092d..41873406a3320 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj
index 90dac0de038ee..8b81e78745802 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/knight_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/etc/knight_r.il b/src/tests/JIT/Methodical/VT/etc/knight_r.il
new file mode 100644
index 0000000000000..25e5467ed8ac9
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/knight_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "knight_il_r"
diff --git a/src/tests/JIT/Methodical/VT/etc/nested.il b/src/tests/JIT/Methodical/VT/etc/nested.il
index a5874ccca658d..d9327664fccf3 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested.il
+++ b/src/tests/JIT/Methodical/VT/etc/nested.il
@@ -8,7 +8,7 @@
.assembly extern mscorlib
{
}
-.assembly 'nested' // as "nested"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_d.il b/src/tests/JIT/Methodical/VT/etc/nested_d.il
new file mode 100644
index 0000000000000..0caf1981619e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/nested_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nested_il_d"
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj b/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj
index 6cb01649686ba..af96a1ccfeeef 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj b/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj
index 6bac7017a0fd7..090f3f2e70f87 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/etc/nested_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/etc/nested_r.il b/src/tests/JIT/Methodical/VT/etc/nested_r.il
new file mode 100644
index 0000000000000..12e554c1e40db
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/etc/nested_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nested_il_r"
diff --git a/src/tests/JIT/Methodical/VT/identity/accum.il b/src/tests/JIT/Methodical/VT/identity/accum.il
index 428bae3856061..6a960d5898688 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum.il
+++ b/src/tests/JIT/Methodical/VT/identity/accum.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly accum // as "accum"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_d.il b/src/tests/JIT/Methodical/VT/identity/accum_d.il
new file mode 100644
index 0000000000000..4800d08c3aace
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/accum_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "accum_il_d"
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj b/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj
index d29cc0bb7978c..d14c3b82f99e0 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj b/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj
index 60fbff2191474..e42d6d0fcf1b8 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj
+++ b/src/tests/JIT/Methodical/VT/identity/accum_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/VT/identity/accum_r.il b/src/tests/JIT/Methodical/VT/identity/accum_r.il
new file mode 100644
index 0000000000000..61f4e3fe6feef
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/accum_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "accum_il_r"
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall.il b/src/tests/JIT/Methodical/VT/identity/livecall.il
index 0abe4382ebb5d..02e0824e4a15b 100644
--- a/src/tests/JIT/Methodical/VT/identity/livecall.il
+++ b/src/tests/JIT/Methodical/VT/identity/livecall.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly livecall // as "livecall"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_d.il b/src/tests/JIT/Methodical/VT/identity/livecall_d.il
new file mode 100644
index 0000000000000..db2afd9aa191a
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/livecall_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "livecall_d"
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_d.ilproj b/src/tests/JIT/Methodical/VT/identity/livecall_d.ilproj
new file mode 100644
index 0000000000000..f2fd137a6fd88
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/livecall_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj b/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj
deleted file mode 100644
index cdbd250c853cc..0000000000000
--- a/src/tests/JIT/Methodical/VT/identity/livecall_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj b/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj
deleted file mode 100644
index f2aaa6d46b79e..0000000000000
--- a/src/tests/JIT/Methodical/VT/identity/livecall_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_r.il b/src/tests/JIT/Methodical/VT/identity/livecall_r.il
new file mode 100644
index 0000000000000..5d9bd86b69e05
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/livecall_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "livecall_r"
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall_r.ilproj b/src/tests/JIT/Methodical/VT/identity/livecall_r.ilproj
new file mode 100644
index 0000000000000..36fadfd725c1c
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/livecall_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile.il b/src/tests/JIT/Methodical/VT/identity/volatile.il
index 063b95388227a..0edb8dc0851d6 100644
--- a/src/tests/JIT/Methodical/VT/identity/volatile.il
+++ b/src/tests/JIT/Methodical/VT/identity/volatile.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'volatile' // // as "bug"
+.assembly ASSEMBLY_NAME // // as "bug"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_d.il b/src/tests/JIT/Methodical/VT/identity/volatile_d.il
new file mode 100644
index 0000000000000..6e92a6499e1ac
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/volatile_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatile_d"
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_d.ilproj b/src/tests/JIT/Methodical/VT/identity/volatile_d.ilproj
new file mode 100644
index 0000000000000..dcb80bcd90ea6
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/volatile_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj b/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj
deleted file mode 100644
index aa9355fb3e6d0..0000000000000
--- a/src/tests/JIT/Methodical/VT/identity/volatile_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj b/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj
deleted file mode 100644
index c23f8a72cb65e..0000000000000
--- a/src/tests/JIT/Methodical/VT/identity/volatile_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_r.il b/src/tests/JIT/Methodical/VT/identity/volatile_r.il
new file mode 100644
index 0000000000000..03b9a518cc07c
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/volatile_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "volatile_r"
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile_r.ilproj b/src/tests/JIT/Methodical/VT/identity/volatile_r.ilproj
new file mode 100644
index 0000000000000..13df97f5682d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/identity/volatile_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref.il b/src/tests/JIT/Methodical/VT/port/huge_gcref.il
index 649ac0d0fec5f..5d8bc97804c6f 100644
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref.il
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref.il
@@ -17,7 +17,7 @@
}
-.assembly 'huge_gcref' // as "test"
+.assembly ASSEMBLY_NAME // as "test"
{
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_d.il b/src/tests/JIT/Methodical/VT/port/huge_gcref_d.il
new file mode 100644
index 0000000000000..84408398704e0
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_gcref_d"
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_d.ilproj b/src/tests/JIT/Methodical/VT/port/huge_gcref_d.ilproj
new file mode 100644
index 0000000000000..634b88fa8845d
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj b/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj
deleted file mode 100644
index 2940abade93a8..0000000000000
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj b/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj
deleted file mode 100644
index 99a394f7fb989..0000000000000
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_r.il b/src/tests/JIT/Methodical/VT/port/huge_gcref_r.il
new file mode 100644
index 0000000000000..24a51164e52e5
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "huge_gcref_r"
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref_r.ilproj b/src/tests/JIT/Methodical/VT/port/huge_gcref_r.ilproj
new file mode 100644
index 0000000000000..e607006351a78
--- /dev/null
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il
index 82ade1ee5a6c6..94411e9d6b527 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly castclass_catch { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_castclass_catch_SEH_il
{
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_d.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_d.il
new file mode 100644
index 0000000000000..dc3833adc40ca
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_catch_d"
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_d.ilproj
new file mode 100644
index 0000000000000..170e59f14a49d
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj
deleted file mode 100644
index 6872ac81768d0..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj
deleted file mode 100644
index 152891a2d26c0..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il
index eaa31c19ca148..5742a8d165bfd 100644
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly castclass_catch_neg { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_castclass_catch_neg_SEH_il
{
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_d.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_d.il
new file mode 100644
index 0000000000000..6e1d87cea5ece
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_catch_neg_d"
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_d.ilproj
new file mode 100644
index 0000000000000..d822420a78e61
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj
deleted file mode 100644
index 2582ab9b67022..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj
deleted file mode 100644
index a9b3fd0a74071..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_r.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_r.il
new file mode 100644
index 0000000000000..e9ca347adcc0a
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_catch_neg_r"
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_r.ilproj
new file mode 100644
index 0000000000000..e692610b53536
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_neg_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_r.il b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_r.il
new file mode 100644
index 0000000000000..97feddfc795b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_catch_r"
diff --git a/src/tests/JIT/Methodical/casts/SEH/castclass_catch_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_r.ilproj
new file mode 100644
index 0000000000000..d6755881475b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/castclass_catch_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter.il b/src/tests/JIT/Methodical/casts/SEH/filter.il
index 5ff20f6e10b5b..8477d48262abb 100644
--- a/src/tests/JIT/Methodical/casts/SEH/filter.il
+++ b/src/tests/JIT/Methodical/casts/SEH/filter.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'filter_SEH_casts' { }
+.assembly ASSEMBLY_NAME { }
.class public auto ansi Test_filter extends [mscorlib] System.Object {
.method public static int32 main() cil managed
{
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_d.ilproj
new file mode 100644
index 0000000000000..a865d4a251cd6
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj
deleted file mode 100644
index 106241a19ea4a..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj
deleted file mode 100644
index d0db87d5a04f0..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_r.ilproj
new file mode 100644
index 0000000000000..a2ac4027b2a00
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/filter_SEH_casts_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_d.il b/src/tests/JIT/Methodical/casts/SEH/filter_d.il
new file mode 100644
index 0000000000000..0cab5fe2b6e03
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/filter_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter_SEH_casts_d"
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter_r.il b/src/tests/JIT/Methodical/casts/SEH/filter_r.il
new file mode 100644
index 0000000000000..9e1958c6138bb
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/filter_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filter_SEH_casts_r"
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il
index 6d39e23c93a1b..1bd70fa837224 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly isinst_catch { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_isinst_catch_SEH_il
{
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_d.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_d.il
new file mode 100644
index 0000000000000..d8b8525deb161
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_catch_d"
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_d.ilproj
new file mode 100644
index 0000000000000..81f9edebbec32
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj
deleted file mode 100644
index d1947bf5a4da5..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj
deleted file mode 100644
index c549fe0f28694..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il
index 80c4dec03a704..37d1fa69302dc 100644
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly isinst_catch_neg { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_isinst_catch_neg_SEH_il
{
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_d.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_d.il
new file mode 100644
index 0000000000000..91376491e3506
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_catch_neg_d"
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_d.ilproj
new file mode 100644
index 0000000000000..5ea53a6207103
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj
deleted file mode 100644
index 231a697322572..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj
deleted file mode 100644
index e2b0d76e33bf0..0000000000000
--- a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_r.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_r.il
new file mode 100644
index 0000000000000..f0d0e5fc9a208
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_catch_neg_r"
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_r.ilproj
new file mode 100644
index 0000000000000..bc931f7926f67
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_neg_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_r.il b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_r.il
new file mode 100644
index 0000000000000..edc9433bb25ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_catch_r"
diff --git a/src/tests/JIT/Methodical/casts/SEH/isinst_catch_r.ilproj b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_r.ilproj
new file mode 100644
index 0000000000000..cc4118b98717d
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/SEH/isinst_catch_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/array/arrays.il b/src/tests/JIT/Methodical/casts/array/arrays.il
index 03a97ca1947bc..6fc600e2c3b29 100644
--- a/src/tests/JIT/Methodical/casts/array/arrays.il
+++ b/src/tests/JIT/Methodical/casts/array/arrays.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly arrays { }
+.assembly ASSEMBLY_NAME { }
.class public auto ansi Test_arrays extends [mscorlib] System.Object {
.method public static int32 main() cil managed
{
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_d.il b/src/tests/JIT/Methodical/casts/array/arrays_d.il
new file mode 100644
index 0000000000000..0efb27dfdcd0d
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/arrays_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "arrays_d"
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_d.ilproj b/src/tests/JIT/Methodical/casts/array/arrays_d.ilproj
new file mode 100644
index 0000000000000..f8ef71b5e1ff9
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/arrays_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj b/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj
deleted file mode 100644
index 05b64c71741d3..0000000000000
--- a/src/tests/JIT/Methodical/casts/array/arrays_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj b/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj
deleted file mode 100644
index 1998d60304d47..0000000000000
--- a/src/tests/JIT/Methodical/casts/array/arrays_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_r.il b/src/tests/JIT/Methodical/casts/array/arrays_r.il
new file mode 100644
index 0000000000000..d092c37e345ba
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/arrays_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "arrays_r"
diff --git a/src/tests/JIT/Methodical/casts/array/arrays_r.ilproj b/src/tests/JIT/Methodical/casts/array/arrays_r.ilproj
new file mode 100644
index 0000000000000..f488211693a4e
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/arrays_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il b/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
index 1c51ac2925ab2..97aec049adbc3 100644
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'castclass_ldlen'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_d.il b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_d.il
new file mode 100644
index 0000000000000..b5d9b0ca47224
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_ldlen_d"
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_d.ilproj b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_d.ilproj
new file mode 100644
index 0000000000000..2cbf7c563ce50
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj
deleted file mode 100644
index 189fd15761612..0000000000000
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj
deleted file mode 100644
index 7df86d952f71a..0000000000000
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_r.il b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_r.il
new file mode 100644
index 0000000000000..22a9b7c0939f1
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_ldlen_r"
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen_r.ilproj b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_r.ilproj
new file mode 100644
index 0000000000000..2c6270e191dd7
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il b/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
index 4d361d123beac..2bde3a29f34ab 100644
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'isinst_ldlen'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_d.il b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_d.il
new file mode 100644
index 0000000000000..d0079f6794085
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_ldlen_d"
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_d.ilproj b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_d.ilproj
new file mode 100644
index 0000000000000..74f27afb51281
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj
deleted file mode 100644
index b4703cb486079..0000000000000
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj
deleted file mode 100644
index 823c8bb69bed1..0000000000000
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_r.il b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_r.il
new file mode 100644
index 0000000000000..7301e38a17207
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_ldlen_r"
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen_r.ilproj b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_r.ilproj
new file mode 100644
index 0000000000000..31bb70e7283bf
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call.il b/src/tests/JIT/Methodical/casts/coverage/castclass_call.il
index 87c20649afe53..72a81b7e04ff6 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly castclass_call
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.il b/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.il
new file mode 100644
index 0000000000000..227fe32b3e242
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_call_il_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj
index 5d1b4e7ea6244..d4989330f6ed1 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj
index d8d9d9fb53ad2..adcae3ea7b11b 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.il b/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.il
new file mode 100644
index 0000000000000..8e0937589001b
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_call_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_call_il_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il b/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il
index 05b286374d4a3..a54f58fce82f8 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly castclass_calli
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_d.il b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_d.il
new file mode 100644
index 0000000000000..0babbf5028e4f
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_calli_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_d.ilproj
new file mode 100644
index 0000000000000..84f2d69a5e236
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj
deleted file mode 100644
index 503098c2c8cae..0000000000000
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj
deleted file mode 100644
index a1820a206bc19..0000000000000
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_r.il b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_r.il
new file mode 100644
index 0000000000000..fadae839b41a8
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_calli_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_calli_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_r.ilproj
new file mode 100644
index 0000000000000..7c9a41de7bf0e
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_calli_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il
index d8423656907c8..4140125e0b181 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly castclass_ldarg
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.il
new file mode 100644
index 0000000000000..1d32d18cf1e03
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_ldarg_il_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj
index a5b57f23c87a8..d4c6b7b6ff5f7 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj
index d56ec05d8b584..bdbcf0a7e8483 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.il
new file mode 100644
index 0000000000000..4eef8bec5037b
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldarg_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_ldarg_il_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il
index ee36f84fdfda3..8fb24ec52dcbf 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly castclass_ldloc
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.il
new file mode 100644
index 0000000000000..b2d2f341f4683
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_ldloc_il_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj
index 46a5d6c4dc71e..2a5b6cbcef8bb 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj
index a671bc601ccd5..6060cc2b9c626 100644
--- a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.il b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.il
new file mode 100644
index 0000000000000..bbd7269773ade
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/castclass_ldloc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "castclass_ldloc_il_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call.il b/src/tests/JIT/Methodical/casts/coverage/isinst_call.il
index 4a04c667c057e..af908f8eb9e82 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly isinst_call
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.il b/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.il
new file mode 100644
index 0000000000000..636dd014249f7
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_call_il_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj
index f77f030ff1747..9e5fe02935e94 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj
index 2d2790f6ae801..ff735424fdd32 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.il b/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.il
new file mode 100644
index 0000000000000..e93330b70b34e
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_call_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_call_il_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il b/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il
index 2c16c5ada9d58..1f9c277a49674 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly isinst_calli
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_d.il b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_d.il
new file mode 100644
index 0000000000000..b992279631e3c
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_calli_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_d.ilproj
new file mode 100644
index 0000000000000..5bb710c1ec7ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj
deleted file mode 100644
index f50ecb0822603..0000000000000
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj
deleted file mode 100644
index 233abacc6a042..0000000000000
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_r.il b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_r.il
new file mode 100644
index 0000000000000..b88b095db3611
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_calli_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_calli_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_r.ilproj
new file mode 100644
index 0000000000000..fb8e5f1129673
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_calli_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il
index 81bbcded4e943..9d690880aca2e 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly isinst_ldarg
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.il
new file mode 100644
index 0000000000000..bce7886c80c22
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_ldarg_il_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj
index 85d4b6bf0eab3..4c6e099e37cf2 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj
index 1070b21d9fe7b..4add2e7037f55 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.il
new file mode 100644
index 0000000000000..b2d4284c69516
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldarg_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_ldarg_il_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il
index e5470351ccdbb..2d4e2ee344af7 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly isinst_ldloc
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.il
new file mode 100644
index 0000000000000..d26542fcab22c
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_ldloc_il_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj
index c597ec2b3a191..1cebb035e4493 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj
index e5b489681b09b..bf82aac3b27c6 100644
--- a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.il b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.il
new file mode 100644
index 0000000000000..586242588df0a
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/isinst_ldloc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "isinst_ldloc_il_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull.il b/src/tests/JIT/Methodical/casts/coverage/ldnull.il
index fa535acc672cb..f98f3a0fe909e 100644
--- a/src/tests/JIT/Methodical/casts/coverage/ldnull.il
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldnull'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_d.il b/src/tests/JIT/Methodical/casts/coverage/ldnull_d.il
new file mode 100644
index 0000000000000..21835eac26aa1
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldnull_d"
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/ldnull_d.ilproj
new file mode 100644
index 0000000000000..186c134ed9d60
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj b/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj
deleted file mode 100644
index 176d35eacd400..0000000000000
--- a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj
deleted file mode 100644
index 57fe3e6a7ee81..0000000000000
--- a/src/tests/JIT/Methodical/casts/coverage/ldnull_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_r.il b/src/tests/JIT/Methodical/casts/coverage/ldnull_r.il
new file mode 100644
index 0000000000000..a26ee2fd85a46
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldnull_r"
diff --git a/src/tests/JIT/Methodical/casts/coverage/ldnull_r.ilproj b/src/tests/JIT/Methodical/casts/coverage/ldnull_r.ilproj
new file mode 100644
index 0000000000000..43eef8225be4f
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/coverage/ldnull_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2.il b/src/tests/JIT/Methodical/casts/iface/iface2.il
index 65f0e6918395d..a5a264157e21f 100644
--- a/src/tests/JIT/Methodical/casts/iface/iface2.il
+++ b/src/tests/JIT/Methodical/casts/iface/iface2.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly iface2 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_iface2_il
{
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_d.il b/src/tests/JIT/Methodical/casts/iface/iface2_d.il
new file mode 100644
index 0000000000000..fbea4c2ab316b
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/iface/iface2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iface2_d"
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_d.ilproj b/src/tests/JIT/Methodical/casts/iface/iface2_d.ilproj
new file mode 100644
index 0000000000000..0a070f675cbd7
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/iface/iface2_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj b/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj
deleted file mode 100644
index 1fa162d784524..0000000000000
--- a/src/tests/JIT/Methodical/casts/iface/iface2_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj b/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj
deleted file mode 100644
index 31bc9b8332a68..0000000000000
--- a/src/tests/JIT/Methodical/casts/iface/iface2_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_r.il b/src/tests/JIT/Methodical/casts/iface/iface2_r.il
new file mode 100644
index 0000000000000..3b895d4f4e226
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/iface/iface2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "iface2_r"
diff --git a/src/tests/JIT/Methodical/casts/iface/iface2_r.ilproj b/src/tests/JIT/Methodical/casts/iface/iface2_r.ilproj
new file mode 100644
index 0000000000000..eb4db98a58a1f
--- /dev/null
+++ b/src/tests/JIT/Methodical/casts/iface/iface2_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock.il b/src/tests/JIT/Methodical/cctor/misc/deadlock.il
index 742e744ff1799..0d2185fc603e6 100644
--- a/src/tests/JIT/Methodical/cctor/misc/deadlock.il
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deadlock {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_deadlock {
.class public A extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_d.il b/src/tests/JIT/Methodical/cctor/misc/deadlock_d.il
new file mode 100644
index 0000000000000..87828afd3edd6
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadlock_d"
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_d.ilproj b/src/tests/JIT/Methodical/cctor/misc/deadlock_d.ilproj
new file mode 100644
index 0000000000000..c4d103dd1bf07
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj b/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
deleted file mode 100644
index fe175449c1d46..0000000000000
--- a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj b/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
deleted file mode 100644
index d6ac237d2d54c..0000000000000
--- a/src/tests/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_r.il b/src/tests/JIT/Methodical/cctor/misc/deadlock_r.il
new file mode 100644
index 0000000000000..0eca7b185b3e0
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadlock_r"
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock_r.ilproj b/src/tests/JIT/Methodical/cctor/misc/deadlock_r.ilproj
new file mode 100644
index 0000000000000..b0b86402e51b4
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/misc/global.il b/src/tests/JIT/Methodical/cctor/misc/global.il
index fdd40f57fb2fe..f8a636abb9864 100644
--- a/src/tests/JIT/Methodical/cctor/misc/global.il
+++ b/src/tests/JIT/Methodical/cctor/misc/global.il
@@ -1,6 +1,6 @@
.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
-.assembly global {}
+.assembly ASSEMBLY_NAME {}
.field static public int32 a at D_00
.method public static rtspecialname specialname void .cctor ()
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_d.il b/src/tests/JIT/Methodical/cctor/misc/global_d.il
new file mode 100644
index 0000000000000..754b0ee878a40
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/global_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "global_d"
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_d.ilproj b/src/tests/JIT/Methodical/cctor/misc/global_d.ilproj
new file mode 100644
index 0000000000000..452ca25ba916f
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/global_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj b/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj
deleted file mode 100644
index 8d78370a923c6..0000000000000
--- a/src/tests/JIT/Methodical/cctor/misc/global_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj b/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj
deleted file mode 100644
index 2ae304e1fd3f2..0000000000000
--- a/src/tests/JIT/Methodical/cctor/misc/global_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_r.il b/src/tests/JIT/Methodical/cctor/misc/global_r.il
new file mode 100644
index 0000000000000..ba90086cfbcb8
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/global_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "global_r"
diff --git a/src/tests/JIT/Methodical/cctor/misc/global_r.ilproj b/src/tests/JIT/Methodical/cctor/misc/global_r.ilproj
new file mode 100644
index 0000000000000..f1a17a2b3ca4f
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/misc/global_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
index 7b5f8582468c6..3438654da1fbd 100644
--- a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
+++ b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'prefldinit3' {}
+.assembly prefldinit3_r {}
.assembly extern xunit.core {}
.namespace Test_prefldinit3_Desktop_il
{
diff --git a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_r.ilproj
similarity index 100%
rename from src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
rename to src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3_r.ilproj
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
index 6260e0fbd6c1a..c770a03248369 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
@@ -12,7 +12,7 @@
.assembly extern mscorlib
{
}
-.assembly 'prefldinit1'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_d.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_d.il
new file mode 100644
index 0000000000000..e26ee664f1edd
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "prefldinit1_d"
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_d.ilproj
new file mode 100644
index 0000000000000..9b7b142cada42
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
deleted file mode 100644
index 10fed70025c4f..0000000000000
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
deleted file mode 100644
index 960c7c0b891e9..0000000000000
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_r.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_r.il
new file mode 100644
index 0000000000000..bd83d4d7375dc
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "prefldinit1_r"
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_r.ilproj
new file mode 100644
index 0000000000000..745dba0fb11db
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
index cf4aac32d515d..863169f72adb1 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
@@ -12,7 +12,7 @@
.assembly extern mscorlib
{
}
-.assembly 'prefldinit2'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_d.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_d.il
new file mode 100644
index 0000000000000..f99475b3dc69d
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "prefldinit2_d"
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_d.ilproj
new file mode 100644
index 0000000000000..0fcd6c589fd34
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
deleted file mode 100644
index 2b00c4e856b27..0000000000000
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
deleted file mode 100644
index f1542bc48a6c7..0000000000000
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_r.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_r.il
new file mode 100644
index 0000000000000..ffde8bc5bce63
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "prefldinit2_r"
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_r.ilproj
new file mode 100644
index 0000000000000..f310f8fd76481
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
index d86f58fa0d277..72a55c1a7a7f2 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
@@ -12,7 +12,7 @@
.assembly extern mscorlib
{
}
-.assembly 'prefldinit4'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_d.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_d.il
new file mode 100644
index 0000000000000..e162af5a3e41c
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "prefldinit4_d"
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_d.ilproj
new file mode 100644
index 0000000000000..e548f3c82aad2
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
deleted file mode 100644
index 7812ef4f820a1..0000000000000
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
deleted file mode 100644
index c6628872b3ea0..0000000000000
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_r.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_r.il
new file mode 100644
index 0000000000000..c430ec0ff95bf
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "prefldinit4_r"
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4_r.ilproj b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_r.ilproj
new file mode 100644
index 0000000000000..edd6d37f7ca4b
--- /dev/null
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower.il b/src/tests/JIT/Methodical/delegate/_simpleoddpower.il
index 8ae36dcddcc0d..a9a6219914a6f 100644
--- a/src/tests/JIT/Methodical/delegate/_simpleoddpower.il
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower.il
@@ -8,7 +8,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib {}
-.assembly _simpleoddpower {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.class interface private abstract auto ansi Power
{
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_d.il b/src/tests/JIT/Methodical/delegate/_simpleoddpower_d.il
new file mode 100644
index 0000000000000..a9d1934b37765
--- /dev/null
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "_simpleoddpower_d"
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_d.ilproj b/src/tests/JIT/Methodical/delegate/_simpleoddpower_d.ilproj
new file mode 100644
index 0000000000000..d3e85b2534566
--- /dev/null
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj b/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
deleted file mode 100644
index 0e067e654f998..0000000000000
--- a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj b/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
deleted file mode 100644
index bf4766676354d..0000000000000
--- a/src/tests/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_r.il b/src/tests/JIT/Methodical/delegate/_simpleoddpower_r.il
new file mode 100644
index 0000000000000..7e5d18d4f4c76
--- /dev/null
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "_simpleoddpower_r"
diff --git a/src/tests/JIT/Methodical/delegate/_simpleoddpower_r.ilproj b/src/tests/JIT/Methodical/delegate/_simpleoddpower_r.ilproj
new file mode 100644
index 0000000000000..77909cf9577df
--- /dev/null
+++ b/src/tests/JIT/Methodical/delegate/_simpleoddpower_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
index f893b5ad09710..90233df77d9c3 100644
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
@@ -10,7 +10,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'emptyfinally' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace hello_emptyfinally_basics_il
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.il b/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.il
new file mode 100644
index 0000000000000..92ef2e1df3680
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "emptyfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
new file mode 100644
index 0000000000000..c909bf897651a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj
deleted file mode 100644
index f6a722c9bb293..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj
deleted file mode 100644
index fb44ada925b88..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.il b/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.il
new file mode 100644
index 0000000000000..1aec15371911b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "emptyfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.ilproj b/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
new file mode 100644
index 0000000000000..330e7e049a3b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept.il b/src/tests/JIT/Methodical/eh/basics/throwinexcept.il
index 7d9baf0586dad..60c39b682adaa 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinexcept.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinexcept' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwinexcept extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.il b/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.il
new file mode 100644
index 0000000000000..c4cb9e6f43f68
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
new file mode 100644
index 0000000000000..403d8324bd936
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj
deleted file mode 100644
index 4baebc353fddd..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj
deleted file mode 100644
index 5a48fe8873b46..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinexcept_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.il b/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.il
new file mode 100644
index 0000000000000..236f7eb429382
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
new file mode 100644
index 0000000000000..7d11398991344
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault.il b/src/tests/JIT/Methodical/eh/basics/throwinfault.il
index 8eb828d30300a..dbd5e3edc0c19 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfault.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinfault' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwinfault extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_d.il b/src/tests/JIT/Methodical/eh/basics/throwinfault_d.il
new file mode 100644
index 0000000000000..66597f8e5b034
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfault_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_d.ilproj
new file mode 100644
index 0000000000000..3afaf2826ba6e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj
deleted file mode 100644
index c2ba344c1243e..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj
deleted file mode 100644
index ba44898d2bf2c..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfault_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_r.il b/src/tests/JIT/Methodical/eh/basics/throwinfault_r.il
new file mode 100644
index 0000000000000..ee5cac924a64c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfault_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfault_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfault_r.ilproj
new file mode 100644
index 0000000000000..3f1e40f828b45
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfault_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter.il b/src/tests/JIT/Methodical/eh/basics/throwinfilter.il
index 1775779aa0a0d..9d1242dc7d024 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfilter.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinfilter' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwinfilter extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.il b/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.il
new file mode 100644
index 0000000000000..6d0ea837c23ea
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfilter_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
new file mode 100644
index 0000000000000..df798474bd2d9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj
deleted file mode 100644
index 2acaf6423c667..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj
deleted file mode 100644
index 201eea997eeaa..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfilter_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.il b/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.il
new file mode 100644
index 0000000000000..14c4796623019
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfilter_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
new file mode 100644
index 0000000000000..2f9a5e9e5fe5f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il
index a2bb2011ec4b5..f0af802745d67 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinfinallyintryfilter1' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwinfinallyintryfilter1 extends [mscorlib] System.Object {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.il
new file mode 100644
index 0000000000000..e71a50c879fc4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfinallyintryfilter1_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
new file mode 100644
index 0000000000000..de90059af2531
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj
deleted file mode 100644
index 89b699c021d5c..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj
deleted file mode 100644
index 83bd5fd5ecdc9..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.il
new file mode 100644
index 0000000000000..a11fc9f437746
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfinallyintryfilter1_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
new file mode 100644
index 0000000000000..6464bebc38e07
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il
index fcfa10cf18bb7..27cae790aa1d4 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinfinallyintryfilter2' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwinfinallyintryfilter2 extends [mscorlib] System.Object {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.il
new file mode 100644
index 0000000000000..c0b2e578047e5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfinallyintryfilter2_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
new file mode 100644
index 0000000000000..95a356c8cfb96
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj
deleted file mode 100644
index 12de6a202b057..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj
deleted file mode 100644
index de463ab467c75..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.il
new file mode 100644
index 0000000000000..71224455fa375
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfinallyintryfilter2_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
new file mode 100644
index 0000000000000..811493662a826
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il
index f16c58be4d4c4..1883762990ddb 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinfinallyintryfilter3' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwinfinallyintryfilter3 extends [mscorlib] System.Object {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.il
new file mode 100644
index 0000000000000..6cfd93b44b3ab
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfinallyintryfilter3_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
new file mode 100644
index 0000000000000..8c44944ad8dfe
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj
deleted file mode 100644
index 7d139f713c459..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj
deleted file mode 100644
index da35be0d3f92c..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.il b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.il
new file mode 100644
index 0000000000000..7373a63aba7e0
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinfinallyintryfilter3_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
new file mode 100644
index 0000000000000..d88caa5216b89
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
index dc902ccc12492..e4cafb1464f02 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
@@ -10,7 +10,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwisfirstinstruction' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_throwisfirstinstruction_il
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.il b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.il
new file mode 100644
index 0000000000000..75dc44dfd10dd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwisfirstinstruction_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
new file mode 100644
index 0000000000000..a1fb49f89814e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj
deleted file mode 100644
index 8ef8874ccd4d1..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj
deleted file mode 100644
index e08b149aff19e..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.il b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.il
new file mode 100644
index 0000000000000..be6c5b7f77379
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwisfirstinstruction_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
new file mode 100644
index 0000000000000..15e566146dee4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept.il b/src/tests/JIT/Methodical/eh/basics/tryexcept.il
index 05e85c9b5e78b..9bd4f3e68eb13 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryexcept.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'tryexcept' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_tryexcept extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_d.il b/src/tests/JIT/Methodical/eh/basics/tryexcept_d.il
new file mode 100644
index 0000000000000..14b01c0298e69
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_d.ilproj
new file mode 100644
index 0000000000000..aed73ca327b17
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj
deleted file mode 100644
index 15eb9e33ca479..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj
deleted file mode 100644
index ef7a50e7b336e..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryexcept_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_r.il b/src/tests/JIT/Methodical/eh/basics/tryexcept_r.il
new file mode 100644
index 0000000000000..d5d9b31dee27e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryexcept_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryexcept_r.ilproj
new file mode 100644
index 0000000000000..9cb961b0c84d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryexcept_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault.il b/src/tests/JIT/Methodical/eh/basics/tryfault.il
index b4638f4ea91b6..d5bae75567af6 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfault.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'tryfault' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_tryfault extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_d.il b/src/tests/JIT/Methodical/eh/basics/tryfault_d.il
new file mode 100644
index 0000000000000..074a50e2d2374
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfault_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_d.ilproj
new file mode 100644
index 0000000000000..1137d8d427ed6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj
deleted file mode 100644
index 0ece467f0c873..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfault_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj
deleted file mode 100644
index f584b0194846c..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfault_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_r.il b/src/tests/JIT/Methodical/eh/basics/tryfault_r.il
new file mode 100644
index 0000000000000..e2dfd6a6a0ca9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfault_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfault_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfault_r.ilproj
new file mode 100644
index 0000000000000..9c64550f6a1f3
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfault_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il
index c466e67cc4831..2f7cdbb02114e 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'tryfaulttrycatch' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_tryfaulttrycatch extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.il
new file mode 100644
index 0000000000000..104e05e2bed02
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfaulttrycatch_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
new file mode 100644
index 0000000000000..0a9fa3e7a47e2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj
deleted file mode 100644
index 0f1c60eef739e..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj
deleted file mode 100644
index 8f5c5caf8df3d..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.il
new file mode 100644
index 0000000000000..0e9d0dfb33d0b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfaulttrycatch_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
new file mode 100644
index 0000000000000..30a8c910362dd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il
index 1ba5da69e28e9..b171b21e92966 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'tryfaulttrycatchfn' {}
+.assembly ASSEMBLY_NAME {}
.method public static void middle() {
.maxstack 1
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.il
new file mode 100644
index 0000000000000..901438f723765
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfaulttrycatchfn_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
new file mode 100644
index 0000000000000..ff0d63277b3f5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj
deleted file mode 100644
index 9d10edd085d1d..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj
deleted file mode 100644
index a51d9912644f2..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.il b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.il
new file mode 100644
index 0000000000000..e46b7cac38fc9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfaulttrycatchfn_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
new file mode 100644
index 0000000000000..cbfdf9cd370e6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
index 7a33713fb33c0..cb9b2bd7cf227 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
@@ -10,7 +10,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'tryfinallywith2endfinally' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace hello_tryfinallywith2endfinally_basics_il
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.il
new file mode 100644
index 0000000000000..9579914bb98ab
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallywith2endfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
new file mode 100644
index 0000000000000..a0b93902a18fd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj
deleted file mode 100644
index 45d980c11b61d..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj
deleted file mode 100644
index b846adc397d9d..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.il
new file mode 100644
index 0000000000000..7c19c4f27efb2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallywith2endfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
new file mode 100644
index 0000000000000..fcc5b6baa6adc
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
index 019fd6e055de9..2d42591a5401c 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
@@ -10,7 +10,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'tryfinallywith2reachableendfinally' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace hello_tryfinallywith2reachableendfinally_basics_il
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.il
new file mode 100644
index 0000000000000..6c382c6e4b6a6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallywith2reachableendfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
new file mode 100644
index 0000000000000..de9fe493b5812
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj
deleted file mode 100644
index 150004d0994f3..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj
deleted file mode 100644
index eab9c72e05a12..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.il
new file mode 100644
index 0000000000000..9e2498d89116a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallywith2reachableendfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
new file mode 100644
index 0000000000000..a9da111cf2df2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il b/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il
index e911d0fc4a130..c46b5493551ea 100644
--- a/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'trythrowexcept' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_trythrowexcept extends [mscorlib] System.Object {
.method public static int32 main() {
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.il b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.il
new file mode 100644
index 0000000000000..f10250c3a0013
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "trythrowexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
new file mode 100644
index 0000000000000..e914f7c36251c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj
deleted file mode 100644
index a4d1ba26bd3a7..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj
deleted file mode 100644
index 48a7828869d25..0000000000000
--- a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.il b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.il
new file mode 100644
index 0000000000000..887b02d4de165
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "trythrowexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
new file mode 100644
index 0000000000000..960fc03c0a629
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il
index 91cde8bcfb22f..61e665ad18c86 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il
@@ -11,7 +11,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'badcodeaftercatch'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.il
new file mode 100644
index 0000000000000..3a795f1e901ea
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeaftercatch_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
new file mode 100644
index 0000000000000..33a193d0a6503
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj
deleted file mode 100644
index 60d7183ff40c2..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj
deleted file mode 100644
index fb94274d5880d..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.il
new file mode 100644
index 0000000000000..764520f521565
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeaftercatch_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
new file mode 100644
index 0000000000000..35f83534ef7ff
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il
index 633ff8bd18387..b53b4e440ed85 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il
@@ -11,7 +11,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'badcodeafterfault'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.il
new file mode 100644
index 0000000000000..61d8765f21ad9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeafterfault_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
new file mode 100644
index 0000000000000..7f4a0bec573f2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj
deleted file mode 100644
index ded0f39685da0..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj
deleted file mode 100644
index 5ff3e725f38fd..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.il
new file mode 100644
index 0000000000000..e669b9104919e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeafterfault_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
new file mode 100644
index 0000000000000..cd3b31de7b89d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il
index 62bb00f05c237..2137a10a555c2 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il
@@ -11,7 +11,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'badcodeafterfilter'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.il
new file mode 100644
index 0000000000000..867f58ba647e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeafterfilter_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
new file mode 100644
index 0000000000000..9ea584772bf85
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj
deleted file mode 100644
index 6b9302fdfaf2b..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj
deleted file mode 100644
index 21ddcec745ebc..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.il
new file mode 100644
index 0000000000000..61f5b604114e7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeafterfilter_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
new file mode 100644
index 0000000000000..9ba7e3f540266
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il
index e5aa5dac7835b..99c5531694e65 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il
@@ -11,7 +11,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'badcodeafterfinally'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.il
new file mode 100644
index 0000000000000..da1c4414eecdd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeafterfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
new file mode 100644
index 0000000000000..f18375788fdc3
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
@@ -0,0 +1,17 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj
deleted file mode 100644
index ba525265e4c13..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_d.ilproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj
deleted file mode 100644
index 8c8ce0bca04fb..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_il_r.ilproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.il
new file mode 100644
index 0000000000000..b683a93dbaa51
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeafterfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
new file mode 100644
index 0000000000000..3c90133f8243f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
@@ -0,0 +1,18 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il
index 3c25b4c507734..d036b329df74a 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il
@@ -11,7 +11,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'badcodeaftertry'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.il
new file mode 100644
index 0000000000000..b5f83be0251a4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeaftertry_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
new file mode 100644
index 0000000000000..b4f8f286bcb41
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj
deleted file mode 100644
index f89a21edaa320..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj
deleted file mode 100644
index 37359da764f7b..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.il
new file mode 100644
index 0000000000000..50d67d683437c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeaftertry_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
new file mode 100644
index 0000000000000..dbc7bc439d370
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
index b84e198c56be4..37629f313fa30 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
@@ -11,7 +11,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'badcodeinsidefinally'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.il
new file mode 100644
index 0000000000000..22896fa6382f1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeinsidefinally_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
new file mode 100644
index 0000000000000..28755d813d146
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj
deleted file mode 100644
index 139b30458e8d7..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj
deleted file mode 100644
index f1cd638fb49eb..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.il
new file mode 100644
index 0000000000000..a31aa96267bde
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "badcodeinsidefinally_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
new file mode 100644
index 0000000000000..cb4b669e635c7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
index 09a0265052c58..09462842a7646 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'branchoverendfinally' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_branchoverendfinally_il
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.il b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.il
new file mode 100644
index 0000000000000..bf0181f80558b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchoverendfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
new file mode 100644
index 0000000000000..a22dfe9f55397
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj
deleted file mode 100644
index 7608a8331358d..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj
deleted file mode 100644
index 435e42ef926db..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.il b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.il
new file mode 100644
index 0000000000000..5861f46dcc329
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchoverendfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
new file mode 100644
index 0000000000000..847f6b2757d00
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
index 9fcf113728346..d10092246a83e 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common {}
-.assembly 'deadEHregionacrossBB'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.il
new file mode 100644
index 0000000000000..033dcee013007
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadEHregionacrossBB_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
new file mode 100644
index 0000000000000..df730ce9bdd67
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
@@ -0,0 +1,16 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj
deleted file mode 100644
index c59d1cd94d5de..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_d.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj
deleted file mode 100644
index bca863db43ddc..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_il_r.ilproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.il
new file mode 100644
index 0000000000000..5bc74d10ee630
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadEHregionacrossBB_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
new file mode 100644
index 0000000000000..6c40a76559912
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
@@ -0,0 +1,17 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
index a317e5c9ec631..3b7e4418b1194 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
@@ -10,7 +10,7 @@
.ver 4:0:0:0
}
.assembly extern eh_common {}
-.assembly 'deadcodeincatch'
+.assembly ASSEMBLY_NAME
{
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.il
new file mode 100644
index 0000000000000..2afb876a5b777
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadcodeincatch_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
new file mode 100644
index 0000000000000..6a4203850b47f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
@@ -0,0 +1,16 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj
deleted file mode 100644
index 2d8b339d775c9..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_d.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj
deleted file mode 100644
index f9a88f8f93b05..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_il_r.ilproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.il
new file mode 100644
index 0000000000000..83d7356f283c9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadcodeincatch_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
new file mode 100644
index 0000000000000..f7f9e3043e6f4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
@@ -0,0 +1,17 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il
index 0ce2d9d47b7d5..abc0455f8bbdd 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'deadnonlocalexit'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.il
new file mode 100644
index 0000000000000..15fe7a8c0ef34
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadnonlocalexit_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
new file mode 100644
index 0000000000000..32b3080b6165e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj
deleted file mode 100644
index 3536124ad0bd9..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj
deleted file mode 100644
index 6e10a162af433..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.il
new file mode 100644
index 0000000000000..4d01ea08a5a54
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadnonlocalexit_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
new file mode 100644
index 0000000000000..28994da1e3ff8
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
index f1ee49f7055bc..08db65756d8d8 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
@@ -5,7 +5,7 @@
.assembly extern mscorlib
{ }
.assembly extern eh_common {}
-.assembly 'deadoponerror'
+.assembly ASSEMBLY_NAME
{ }
.assembly extern xunit.core {}
.class public auto ansi Test_deadoponerror extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.il
new file mode 100644
index 0000000000000..6613d40e3339b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadoponerror_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
new file mode 100644
index 0000000000000..d07e5fd44a56e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
@@ -0,0 +1,16 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj
deleted file mode 100644
index 392eb9e7315e1..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_d.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj
deleted file mode 100644
index 9ba74a477a8c4..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_il_r.ilproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.il
new file mode 100644
index 0000000000000..ae14bda1c22ad
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadoponerror_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
new file mode 100644
index 0000000000000..ae9f0e6b02713
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
@@ -0,0 +1,17 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
index 030e0ca0f72ba..8ec9d8da9ae21 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
@@ -12,7 +12,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'deadoponerrorinfunclet'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.il
new file mode 100644
index 0000000000000..dad9e20205ae4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadoponerrorinfunclet_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
new file mode 100644
index 0000000000000..fa872bd043ef5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
@@ -0,0 +1,16 @@
+
+
+ true
+ true
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj
deleted file mode 100644
index 33f66568eaecd..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- true
- true
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj
deleted file mode 100644
index f0168f105ce27..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- true
- true
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.il
new file mode 100644
index 0000000000000..9c43cc49b8249
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadoponerrorinfunclet_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
new file mode 100644
index 0000000000000..a6c92ae17344a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
@@ -0,0 +1,17 @@
+
+
+ true
+ true
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il
index 85e79759cfb9a..4c04bbfce1300 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'deadrgninfunclet'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.il
new file mode 100644
index 0000000000000..82644a3dd55bd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadrgninfunclet_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
new file mode 100644
index 0000000000000..4cc09b6531f55
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj
deleted file mode 100644
index 87849348cd8eb..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj
deleted file mode 100644
index 91db6617db030..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.il
new file mode 100644
index 0000000000000..548acb6368b5d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadrgninfunclet_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
new file mode 100644
index 0000000000000..4d8686abb4f1c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il
index 0c82715d807a8..278db3436b03d 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'deadtrycatch'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.il
new file mode 100644
index 0000000000000..bad3b38334062
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadtrycatch_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
new file mode 100644
index 0000000000000..387a78ba847d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj
deleted file mode 100644
index 7a844f143cae4..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj
deleted file mode 100644
index 0ff109fc23cff..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.il
new file mode 100644
index 0000000000000..550f8fd13ab6c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadtrycatch_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
new file mode 100644
index 0000000000000..5b506a4963391
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il
index 21ef6cdfb90b4..9217e0eb26774 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'deadtryfinally'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.il
new file mode 100644
index 0000000000000..a1787118027ba
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadtryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
new file mode 100644
index 0000000000000..c56df43937cee
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj
deleted file mode 100644
index 12f484b37bcac..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj
deleted file mode 100644
index 432f042f91f71..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.il
new file mode 100644
index 0000000000000..63cc2ecf72de9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadtryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
new file mode 100644
index 0000000000000..05d9e4888a330
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il
index 0ecc73400404d..4998ee32e4b6d 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'deadtryfinallythrow'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.il
new file mode 100644
index 0000000000000..4764aff307572
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadtryfinallythrow_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
new file mode 100644
index 0000000000000..442604b7661e5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj
deleted file mode 100644
index 3a678a980b0d8..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj
deleted file mode 100644
index ccefeec0eaa8c..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.il b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.il
new file mode 100644
index 0000000000000..1bdc5a57c3d2d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deadtryfinallythrow_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
new file mode 100644
index 0000000000000..a7af22ac82a7d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
index b4930de33b69a..f2f6aefccdb81 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
@@ -15,7 +15,7 @@
}
.assembly extern eh_common{}
-.assembly 'endfinallyinloop'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.il b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.il
new file mode 100644
index 0000000000000..27e8f541f8e35
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "endfinallyinloop_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
new file mode 100644
index 0000000000000..60ae62288bac7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj
deleted file mode 100644
index b3b17010d0c53..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj
deleted file mode 100644
index 6efd34be67957..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.il b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.il
new file mode 100644
index 0000000000000..5de679aaa91fb
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "endfinallyinloop_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
new file mode 100644
index 0000000000000..4668824480424
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il
index 2f0808b160603..dc58d78b8d665 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions.il
@@ -15,7 +15,7 @@
}
.assembly extern eh_common{}
-.assembly 'severaldeadehregions'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.il b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.il
new file mode 100644
index 0000000000000..30be4e51a7bb0
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "severaldeadehregions_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
new file mode 100644
index 0000000000000..c9b8c8da13619
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj
deleted file mode 100644
index 179bb9e5f78cd..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj
deleted file mode 100644
index 07244e9a3709e..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.il b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.il
new file mode 100644
index 0000000000000..8fcdba9e8eeaf
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "severaldeadehregions_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
new file mode 100644
index 0000000000000..6a9924d02a14a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il
index 59c1be45bfcdf..7cd9f294b9de2 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'severalnesteddeadehregions'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.il b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.il
new file mode 100644
index 0000000000000..8af911335d492
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "severalnesteddeadehregions_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
new file mode 100644
index 0000000000000..94dea50d998f5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj
deleted file mode 100644
index d7320fa98b9fc..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj
deleted file mode 100644
index a7c2199800e9f..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.il b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.il
new file mode 100644
index 0000000000000..08a0d7a3f380f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "severalnesteddeadehregions_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
new file mode 100644
index 0000000000000..3e784fc8942e5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il
index 160d7b0ce6cf9..4458e28f5c91f 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'simpledeadehregion'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.il b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.il
new file mode 100644
index 0000000000000..5e37433de041f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "simpledeadehregion_d"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
new file mode 100644
index 0000000000000..ff05dc416c865
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj
deleted file mode 100644
index 0eb2a7ee926f6..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj
deleted file mode 100644
index f64d19fe8ffc8..0000000000000
--- a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.il b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.il
new file mode 100644
index 0000000000000..056ab29078510
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "simpledeadehregion_r"
diff --git a/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
new file mode 100644
index 0000000000000..dc4b08c688e52
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il b/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il
index a427a170967ec..fed31241cc5bf 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'backwardleave'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.il b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.il
new file mode 100644
index 0000000000000..cf937c7327448
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "backwardleave_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
new file mode 100644
index 0000000000000..9b538578afcc5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj
deleted file mode 100644
index 981b4fcd1f24f..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj
deleted file mode 100644
index 12cf2d8468f78..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.il b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.il
new file mode 100644
index 0000000000000..14f1236fc2104
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "backwardleave_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
new file mode 100644
index 0000000000000..d24f989f19c45
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il
index 7870eac45bcb0..b9aa11661c53e 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common{}
-.assembly 'catchbeforetrybody'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.il b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.il
new file mode 100644
index 0000000000000..a828517ecc20f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchbeforetrybody_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
new file mode 100644
index 0000000000000..69e0926d9f0e7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj
deleted file mode 100644
index 306015e6299fc..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj
deleted file mode 100644
index b9581d8211626..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.il b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.il
new file mode 100644
index 0000000000000..7e07f4bb4c7fe
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchbeforetrybody_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
new file mode 100644
index 0000000000000..17b5a91b7b7ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il
index 43f61b5d123d3..3a2b0fba2806f 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'catchtryintryfinally'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.il b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.il
new file mode 100644
index 0000000000000..8b9433c4c36e1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchtryintryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
new file mode 100644
index 0000000000000..feba426fd3409
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj
deleted file mode 100644
index f3db7d5148207..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj
deleted file mode 100644
index 9af5aef6ca022..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.il b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.il
new file mode 100644
index 0000000000000..fd2f0fd7294c0
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchtryintryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
new file mode 100644
index 0000000000000..afa489ebc9b0f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il
index 803d1f064f7c1..2b594ecc672a6 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'faultbeforetrybody'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.il b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.il
new file mode 100644
index 0000000000000..7885e77e8d16b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "faultbeforetrybody_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
new file mode 100644
index 0000000000000..7d9938f5943f4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj
deleted file mode 100644
index d8ddc8eaa20c9..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj
deleted file mode 100644
index 624f5a8e1f9e0..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.il b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.il
new file mode 100644
index 0000000000000..018a8257cdc6c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "faultbeforetrybody_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
new file mode 100644
index 0000000000000..b43a37a2d10ab
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il
index 4af2b3d6f5c65..8fe951b8a4631 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'finallybeforetrybody'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.il b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.il
new file mode 100644
index 0000000000000..e02cb0aeb0df9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "finallybeforetrybody_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
new file mode 100644
index 0000000000000..364a62279a973
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj
deleted file mode 100644
index a8013d5117fd7..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj
deleted file mode 100644
index 6d17437c0d8d3..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.il b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.il
new file mode 100644
index 0000000000000..21097d10e8d57
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "finallybeforetrybody_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
new file mode 100644
index 0000000000000..570cecc1a5da5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il
index a0c63321bca3b..6e2f99d2042e9 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'finallytryintryfinally'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.il b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.il
new file mode 100644
index 0000000000000..2c57ca7e3628b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "finallytryintryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
new file mode 100644
index 0000000000000..7de26ad6e5a72
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj
deleted file mode 100644
index 00af311657265..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj
deleted file mode 100644
index 2ff4567705ebc..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.il b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.il
new file mode 100644
index 0000000000000..c7829db5bdfe4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "finallytryintryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
new file mode 100644
index 0000000000000..99a4a5bc15462
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il
index 32c8aa85d77f9..36668c3c36507 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'reversedhandlers'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.il b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.il
new file mode 100644
index 0000000000000..d038e49c188c8
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "reversedhandlers_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
new file mode 100644
index 0000000000000..2c6c609a39a79
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj
deleted file mode 100644
index 6ff6886a6da8c..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj
deleted file mode 100644
index 837c453322cd7..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.il b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.il
new file mode 100644
index 0000000000000..9776d9c3b77bd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "reversedhandlers_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
new file mode 100644
index 0000000000000..25092ed6f86ee
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il
index d71a80ec8ff2e..f873b16af0163 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'reversedtryblock'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.il b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.il
new file mode 100644
index 0000000000000..b8808b5595b8e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "reversedtryblock_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
new file mode 100644
index 0000000000000..6b945923f2725
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj
deleted file mode 100644
index f85b78c7d44a1..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj
deleted file mode 100644
index b5da9b73c0fba..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.il b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.il
new file mode 100644
index 0000000000000..f2ec4e76aeb1c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "reversedtryblock_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
new file mode 100644
index 0000000000000..193661ee0fdcf
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il
index 36b6c0a47b97f..59a4323a51399 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'sehhandlerbeforetry'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.il b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.il
new file mode 100644
index 0000000000000..76337b8ca1c2a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sehhandlerbeforetry_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
new file mode 100644
index 0000000000000..40b3f4d87a35e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj
deleted file mode 100644
index 9e5224e5c77a4..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj
deleted file mode 100644
index 46175b68dae69..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.il b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.il
new file mode 100644
index 0000000000000..c5ce77a8084c2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sehhandlerbeforetry_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
new file mode 100644
index 0000000000000..dd6ba7c7a74fd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit.il b/src/tests/JIT/Methodical/eh/disconnected/testeit.il
index 93a10a0526657..31e9884a5ad66 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/testeit.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'testeit'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_d.il b/src/tests/JIT/Methodical/eh/disconnected/testeit_d.il
new file mode 100644
index 0000000000000..370f54a096f69
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "testeit_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_d.ilproj
new file mode 100644
index 0000000000000..f008d7d4fbccb
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj
deleted file mode 100644
index d189b14918f47..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj
deleted file mode 100644
index fbdf3c63039c7..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/testeit_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_r.il b/src/tests/JIT/Methodical/eh/disconnected/testeit_r.il
new file mode 100644
index 0000000000000..bea5eb8ad03fe
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "testeit_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/testeit_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/testeit_r.ilproj
new file mode 100644
index 0000000000000..3f2c429021692
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/testeit_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il
index de3b8c4e7be5e..c8a1d9a1a8af7 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers.il
@@ -14,7 +14,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'trybodyinbetweencatchhandlers'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.il b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.il
new file mode 100644
index 0000000000000..85ab9781d8e8c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "trybodyinbetweencatchhandlers_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
new file mode 100644
index 0000000000000..2f739f00aceae
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj
deleted file mode 100644
index 690d3659cbf50..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj
deleted file mode 100644
index d5aca26bb93ed..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.il b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.il
new file mode 100644
index 0000000000000..60b9cc9473ff1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "trybodyinbetweencatchhandlers_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
new file mode 100644
index 0000000000000..21eaaa29f5cd1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il
index ef3bc251e50f0..65a1d637ca4c6 100644
--- a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry.il
@@ -13,7 +13,7 @@
.ver 0:0:0:0
}
.assembly extern eh_common {}
-.assembly 'tryfinallyincatchtry'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.il b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.il
new file mode 100644
index 0000000000000..ada6f13f9bd4a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallyincatchtry_d"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
new file mode 100644
index 0000000000000..674207db2fe6a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj
deleted file mode 100644
index c9c5b4a84a8c5..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj
deleted file mode 100644
index b96e61e1659e2..0000000000000
--- a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- pdbonly
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.il b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.il
new file mode 100644
index 0000000000000..28e1cd5f645a7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallyincatchtry_r"
diff --git a/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
new file mode 100644
index 0000000000000..cc7c7586215c6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ pdbonly
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
index 50b0176e0ca8f..0514144f449bb 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
@@ -12,7 +12,7 @@
{
}
.assembly extern eh_common{}
- .assembly catchrettoinnertry
+ .assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.il b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.il
new file mode 100644
index 0000000000000..1a3aee665a460
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchrettoinnertry_d"
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
new file mode 100644
index 0000000000000..28e8976f40bc6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj
deleted file mode 100644
index c2bdb01ee41b8..0000000000000
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj
deleted file mode 100644
index 104df2007c1cb..0000000000000
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.il b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.il
new file mode 100644
index 0000000000000..5ebc633d0af07
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchrettoinnertry_r"
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
new file mode 100644
index 0000000000000..3384b6e3d1062
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il
index d129ac8ef036b..30e714a891879 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib {}
.assembly extern System {}
.assembly extern eh_common{}
-.assembly 'nestedfinallycall' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_nestedfinallycall {
.class public EHTest
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.il b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.il
new file mode 100644
index 0000000000000..de621e46b7f04
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedfinallycall_d"
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
new file mode 100644
index 0000000000000..6bcf4188964eb
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj
deleted file mode 100644
index f041ce54a9167..0000000000000
--- a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj
deleted file mode 100644
index de7de715c7072..0000000000000
--- a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.il b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.il
new file mode 100644
index 0000000000000..32744f09e4fe6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedfinallycall_r"
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
new file mode 100644
index 0000000000000..2dc92b6fce62f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
index 97e8046e18a3b..7997cf92f0ae4 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
@@ -10,7 +10,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common{}
- .assembly 'nonlocalexittonestedsibling' {}
+ .assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.il b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.il
new file mode 100644
index 0000000000000..a774c2b6d204e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nonlocalexittonestedsibling_d"
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
new file mode 100644
index 0000000000000..cd9c8c3b6c6d9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj
deleted file mode 100644
index 0d98ce4535f4b..0000000000000
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj
deleted file mode 100644
index 442a97cc8c2ed..0000000000000
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.il b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.il
new file mode 100644
index 0000000000000..ab80325161751
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nonlocalexittonestedsibling_r"
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
new file mode 100644
index 0000000000000..c843d5cbb3352
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
index c2f2493617d8c..dee6caeab028e 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
@@ -19,7 +19,7 @@
}
.assembly extern eh_common{}
-.assembly 'throw1dimarray'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.il b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.il
new file mode 100644
index 0000000000000..adb762686d16f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throw1dimarray_d"
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
new file mode 100644
index 0000000000000..0a63d51f6c0b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj
deleted file mode 100644
index bc7ebcc09251a..0000000000000
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj
deleted file mode 100644
index c4540ed797d77..0000000000000
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.il b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.il
new file mode 100644
index 0000000000000..ee4f5a9c777ac
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throw1dimarray_r"
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
new file mode 100644
index 0000000000000..fce36c4807f00
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
index 9a1d306739ade..443f7e77729fa 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
@@ -18,7 +18,7 @@
{
.ver 0:0:0:0
}
-.assembly 'throw2dimarray'
+.assembly ASSEMBLY_NAME
{
.ver 0:0:0:0
}
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.il b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.il
new file mode 100644
index 0000000000000..c5642fc0d2045
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throw2dimarray_d"
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
new file mode 100644
index 0000000000000..d65f12088c461
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj
deleted file mode 100644
index 9f6901323105d..0000000000000
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj
deleted file mode 100644
index 1026a97ea7e30..0000000000000
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.il b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.il
new file mode 100644
index 0000000000000..5746d86890b03
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throw2dimarray_r"
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
new file mode 100644
index 0000000000000..479d2275c8863
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
index 676ef7ebba058..3076ccc685e18 100644
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly '2branchesoutoftry'{
+.assembly ASSEMBLY_NAME{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.il b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.il
new file mode 100644
index 0000000000000..d527c73d2667c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'2branchesoutoftry_d'"
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
new file mode 100644
index 0000000000000..44afc65a427a0
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj
deleted file mode 100644
index 77377afceee8a..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj
deleted file mode 100644
index 503d693fed418..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.il b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.il
new file mode 100644
index 0000000000000..76295c3871a91
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "'2branchesoutoftry_r'"
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
new file mode 100644
index 0000000000000..589e6846132ed
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
index 70ce8168d15da..5148525be70f9 100644
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'backwardleaveincatch'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.il b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.il
new file mode 100644
index 0000000000000..c98f0ba4f4908
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "backwardleaveincatch_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
new file mode 100644
index 0000000000000..90ac81304a0a9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj
deleted file mode 100644
index 908d7e96dec07..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj
deleted file mode 100644
index 09b8da72cce4d..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.il b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.il
new file mode 100644
index 0000000000000..23534c5888696
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "backwardleaveincatch_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
new file mode 100644
index 0000000000000..0e734a9bfb366
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
index dc94e6c5f5515..5df53b32f0170 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'branchbackwardswithcatch'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.il
new file mode 100644
index 0000000000000..d6913cb1568d3
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchbackwardswithcatch_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
new file mode 100644
index 0000000000000..b2daf45930461
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj
deleted file mode 100644
index 034ea3757094e..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj
deleted file mode 100644
index be31959b05f2b..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.il
new file mode 100644
index 0000000000000..c5f3fefc7212a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchbackwardswithcatch_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
new file mode 100644
index 0000000000000..d8bc6249c2618
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
index 6732501208e81..c5e35f43f48fd 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly branchbackwardswithfinally
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.il
new file mode 100644
index 0000000000000..6f8264c1deb9b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchbackwardswithfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
new file mode 100644
index 0000000000000..672014670138c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj
deleted file mode 100644
index 60032669adeff..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj
deleted file mode 100644
index c5f670208a76c..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.il
new file mode 100644
index 0000000000000..348740e143c48
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchbackwardswithfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
new file mode 100644
index 0000000000000..0227e7f6a3c72
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
index 07d0b690d368b..a70febd7982ac 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'branchoutofnestedtryfinally'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.il b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.il
new file mode 100644
index 0000000000000..4f04a9193e4e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchoutofnestedtryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
new file mode 100644
index 0000000000000..c11a0712342d9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj
deleted file mode 100644
index 7ed00ef28e1bd..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj
deleted file mode 100644
index 043b1a9e3ada6..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.il b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.il
new file mode 100644
index 0000000000000..42930115147ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchoutofnestedtryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
new file mode 100644
index 0000000000000..cc4c5ebcc429d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
index 298057e4af236..72bc63f1dcb37 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
@@ -14,7 +14,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'branchoutoftryfinally'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.il b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.il
new file mode 100644
index 0000000000000..8ef31f7debdb4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchoutoftryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
new file mode 100644
index 0000000000000..a25d808c63158
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj
deleted file mode 100644
index 92bfd9197e5ea..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj
deleted file mode 100644
index 672e836efeaf5..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.il b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.il
new file mode 100644
index 0000000000000..1b99828c3b23d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "branchoutoftryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
new file mode 100644
index 0000000000000..2c4e9371c16c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
index 46917a5917dab..7c92828098e07 100644
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'forwardleaveincatch'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.il b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.il
new file mode 100644
index 0000000000000..fea9ee74d4be5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "forwardleaveincatch_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
new file mode 100644
index 0000000000000..52d387c260b1c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj
deleted file mode 100644
index 1892f3169e3d4..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj
deleted file mode 100644
index 9a93547062588..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.il b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.il
new file mode 100644
index 0000000000000..08fa2055bc8cb
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "forwardleaveincatch_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
new file mode 100644
index 0000000000000..c569aad3e4b04
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
index 9f6f552b39660..2b043a9da818f 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
@@ -12,7 +12,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'labelbeforefinally'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 1:0:3018:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.il b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.il
new file mode 100644
index 0000000000000..514c045084621
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "labelbeforefinally_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
new file mode 100644
index 0000000000000..afe54e82f382c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj
deleted file mode 100644
index e4f1d0c9b2478..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj
deleted file mode 100644
index 0a653eef122a5..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.il b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.il
new file mode 100644
index 0000000000000..4e985a4a59645
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "labelbeforefinally_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
new file mode 100644
index 0000000000000..d8266a33fb7dd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
index 6780272cce600..44bbcec2e1560 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'labelbeginningfinally'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 1:0:3018:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.il b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.il
new file mode 100644
index 0000000000000..e9575de090f2a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "labelbeginningfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
new file mode 100644
index 0000000000000..a200b88e3ddd6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj
deleted file mode 100644
index f4e40f9e99ea9..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj
deleted file mode 100644
index f30a5c5ee5654..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.il b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.il
new file mode 100644
index 0000000000000..58ee2c05cf0c4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "labelbeginningfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
new file mode 100644
index 0000000000000..d87bf581f2fa4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
index a054f888417de..5712e48d3dcad 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'leaveinsameregion'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.il b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.il
new file mode 100644
index 0000000000000..442d35d33083e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "leaveinsameregion_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
new file mode 100644
index 0000000000000..1051fca33e8d9
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj
deleted file mode 100644
index 2095d72351d6d..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj
deleted file mode 100644
index 060ca490f5afe..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.il b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.il
new file mode 100644
index 0000000000000..41e38ff5f0fcf
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "leaveinsameregion_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
new file mode 100644
index 0000000000000..3592d5e351824
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
index 60d21057082c9..9bda8ecf8eb82 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
@@ -13,7 +13,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'leaveintotrybody'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.il b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.il
new file mode 100644
index 0000000000000..9e504e09c6e60
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "leaveintotrybody_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
new file mode 100644
index 0000000000000..051a286c4c6e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj
deleted file mode 100644
index a453c57ffa9c4..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj
deleted file mode 100644
index 8dc5bae6c2f16..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.il b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.il
new file mode 100644
index 0000000000000..ca9e4784e3dc6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "leaveintotrybody_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
new file mode 100644
index 0000000000000..faeaac32e2478
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
index b1e25aac90174..bc74d05de43c0 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
@@ -14,7 +14,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'tryfinallyintrycatchwithleaveintotry'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.il b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.il
new file mode 100644
index 0000000000000..851143003431f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallyintrycatchwithleaveintotry_d"
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
new file mode 100644
index 0000000000000..3521d11cbd466
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj
deleted file mode 100644
index 4c6c6ca342cd0..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj
deleted file mode 100644
index a56b303cb296f..0000000000000
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.il b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.il
new file mode 100644
index 0000000000000..ac397a5af72e1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tryfinallyintrycatchwithleaveintotry_r"
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
new file mode 100644
index 0000000000000..d9bb46e85a021
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
index 4f458f6a3e993..f3577127c4f23 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
@@ -16,7 +16,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'catchfiltercatch'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.il b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.il
new file mode 100644
index 0000000000000..9e1c8cd70cba7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfiltercatch_d"
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
new file mode 100644
index 0000000000000..6d3bae5002ff2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj
deleted file mode 100644
index c00ca0f5ab41d..0000000000000
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj
deleted file mode 100644
index 1306211ce9091..0000000000000
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.il b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.il
new file mode 100644
index 0000000000000..54de089677ee5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "catchfiltercatch_r"
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
new file mode 100644
index 0000000000000..3cbf5d766e048
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
index 8204d2fd8aeea..f67f00ed21701 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
@@ -16,7 +16,7 @@
{
}
.assembly extern eh_common{}
-.assembly 'filterfiltercatchcatch'
+.assembly ASSEMBLY_NAME
{
.hash algorithm 0x00008004
.ver 0:0:0:0
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.il b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.il
new file mode 100644
index 0000000000000..c22cd8f842f57
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filterfiltercatchcatch_d"
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
new file mode 100644
index 0000000000000..699c73a131596
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj
deleted file mode 100644
index d51b645652068..0000000000000
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj
deleted file mode 100644
index e80ba5e5eb937..0000000000000
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.il b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.il
new file mode 100644
index 0000000000000..4daae34098fa3
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "filterfiltercatchcatch_r"
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
new file mode 100644
index 0000000000000..f5f87456bf8f6
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il
index ebc35a59abd0c..25f02b390c939 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'cascadedcatch' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.il
new file mode 100644
index 0000000000000..2f7031e1ec26f
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cascadedcatch_il_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj
index a124fc393418a..a9689cd8e1945 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj
index 6a7b1109ee730..97a1ac3ffa559 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_il_r.ilproj
@@ -6,6 +6,7 @@
False
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.il
new file mode 100644
index 0000000000000..8a6128759bc00
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cascadedcatch_il_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il
index d889311e19f93..93638babaa345 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'cascadedexcept' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_cascadedexcept extends [mscorlib] System.Object {
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.il
new file mode 100644
index 0000000000000..1ca17fecd5615
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cascadedexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
new file mode 100644
index 0000000000000..abc0f900564af
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj
deleted file mode 100644
index cf39dcdf17b8a..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj
deleted file mode 100644
index 77025c3a21eee..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.il
new file mode 100644
index 0000000000000..2316d65865d4e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cascadedexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
new file mode 100644
index 0000000000000..bf65f88d55971
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il
index 6cbfba0b5ce46..54c732a2e4a7d 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwincascadedcatch' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.il
new file mode 100644
index 0000000000000..18aa2aadff0fe
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedcatch_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
new file mode 100644
index 0000000000000..39e462c022294
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj
deleted file mode 100644
index ddc04c3be91d7..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj
deleted file mode 100644
index 2d33fc90b673f..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.il
new file mode 100644
index 0000000000000..3767b8528f090
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedcatch_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
new file mode 100644
index 0000000000000..543baa8d50c01
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il
index 0334dc2aa80b1..516b95c4c7891 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwincascadedcatchnofin' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_throwincascadedcatchnofin extends [mscorlib] System.Object {
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.il
new file mode 100644
index 0000000000000..87e7daa46de44
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedcatchnofin_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
new file mode 100644
index 0000000000000..a7e6af9010270
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj
deleted file mode 100644
index 77bbcf62725e8..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj
deleted file mode 100644
index 1dee6b9240be6..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.il
new file mode 100644
index 0000000000000..e2d2b21d513e1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedcatchnofin_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
new file mode 100644
index 0000000000000..340d937d963ab
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il
index aa37231ebaf79..0201a622fc4d5 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwincascadedexcept' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.il
new file mode 100644
index 0000000000000..1b9c65c3d88f2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
new file mode 100644
index 0000000000000..ae917ed518052
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj
deleted file mode 100644
index 8ee9633cbeab1..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj
deleted file mode 100644
index 6cebf91f554b5..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.il
new file mode 100644
index 0000000000000..9b4ad4c7e3977
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
new file mode 100644
index 0000000000000..2b411deb49ca2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il
index 39996e08c7ce8..2a6780e394886 100644
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwincascadedexceptnofin' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.il
new file mode 100644
index 0000000000000..0792b01f8ecda
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedexceptnofin_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
new file mode 100644
index 0000000000000..79075f61d2721
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ Full
+ 2000000
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj
deleted file mode 100644
index 53a9d7d358e60..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- Full
- 2000000
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj
deleted file mode 100644
index 2562d07f7d4c9..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.il b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.il
new file mode 100644
index 0000000000000..35502517f1450
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwincascadedexceptnofin_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
new file mode 100644
index 0000000000000..2cc41ed24a543
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il
index 3fce7a2a88d86..c38c8f5af8c76 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch.il
@@ -11,7 +11,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'localvarincatch' {}
+.assembly ASSEMBLY_NAME {}
.class public auto ansi Test_localvarincatch extends [mscorlib] System.Object {
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.il b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.il
new file mode 100644
index 0000000000000..0cdb3acc0c626
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "localvarincatch_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
new file mode 100644
index 0000000000000..955652a9a2deb
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj
deleted file mode 100644
index 3861cf175ba54..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj
deleted file mode 100644
index 9d05d9f63e4d4..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.il b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.il
new file mode 100644
index 0000000000000..4cabfbaed72f5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "localvarincatch_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
new file mode 100644
index 0000000000000..c865d1d9714b3
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
index d376c0782388b..f7c7bad2dec15 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
@@ -10,7 +10,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinnestedcatch' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.il b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.il
new file mode 100644
index 0000000000000..9c82b5a3c7f3b
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedcatch_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
new file mode 100644
index 0000000000000..7519c89f65df2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj
deleted file mode 100644
index c3bdf18d3273d..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj
deleted file mode 100644
index b16b772e0d064..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.il b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.il
new file mode 100644
index 0000000000000..0d4d30c2d522d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedcatch_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
new file mode 100644
index 0000000000000..2f08944b90f60
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il
index 8348bfc63db98..23c392bfc55c4 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'nestedtrycatch' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.il
new file mode 100644
index 0000000000000..f842f649687c4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtrycatch_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
new file mode 100644
index 0000000000000..deb64852d60e1
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj
deleted file mode 100644
index df5230ec85cd2..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj
deleted file mode 100644
index 94b45bf7bef49..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.il
new file mode 100644
index 0000000000000..b084d992e04e4
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtrycatch_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
new file mode 100644
index 0000000000000..8bffaeaaf5e7e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il
index d0e4fab33aff0..6558aa573c945 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'nestedtryexcept' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.il
new file mode 100644
index 0000000000000..7d130c8c4b518
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtryexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
new file mode 100644
index 0000000000000..d5defc836c534
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj
deleted file mode 100644
index f04572ca63e9f..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj
deleted file mode 100644
index 5119f10cad442..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.il
new file mode 100644
index 0000000000000..3e4b86fe20275
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtryexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
new file mode 100644
index 0000000000000..e683eba95e95a
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il
index 5fa2dddb52b56..96c5f1a29a26a 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'nestedtryfault' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.il
new file mode 100644
index 0000000000000..5afa592443693
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtryfault_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
new file mode 100644
index 0000000000000..d1a933eff402c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj
deleted file mode 100644
index 1b098390d3ec3..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj
deleted file mode 100644
index 305136c13afba..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.il
new file mode 100644
index 0000000000000..099fbd38c283e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtryfault_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
new file mode 100644
index 0000000000000..2d9ebee433aa7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il
index 59048a79f61b3..15aaabf734b5a 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'nestedtryfinally' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.il
new file mode 100644
index 0000000000000..ff4950e070733
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
new file mode 100644
index 0000000000000..c523bf4625111
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj
deleted file mode 100644
index da0235b46c275..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj
deleted file mode 100644
index 5ebd7728a4d63..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.il
new file mode 100644
index 0000000000000..843d023d0856e
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "nestedtryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
new file mode 100644
index 0000000000000..971d7679e980d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il
index 78a81c73c59b0..864e7ca09924c 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinnestedtrycatch' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.il
new file mode 100644
index 0000000000000..2cbf1c4845cc0
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtrycatch_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
new file mode 100644
index 0000000000000..ffdef4777a8ff
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj
deleted file mode 100644
index 1f16c9fc1b9ee..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj
deleted file mode 100644
index 3060d049b8202..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.il
new file mode 100644
index 0000000000000..9c6b109e1f13d
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtrycatch_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
new file mode 100644
index 0000000000000..d87a0329fb7d2
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il
index 66220c2b861ff..9676f8b81aaeb 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinnestedtryexcept' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.il
new file mode 100644
index 0000000000000..9055ddb124e07
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtryexcept_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
new file mode 100644
index 0000000000000..5ca8eb781c664
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj
deleted file mode 100644
index 194646e27f92c..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj
deleted file mode 100644
index 58d1ae46cb90e..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.il
new file mode 100644
index 0000000000000..7e3561138a24c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtryexcept_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
new file mode 100644
index 0000000000000..7b686b772d8e7
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il
index a0a064f14318c..bfbdca33bfc1d 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinnestedtryfault' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.il
new file mode 100644
index 0000000000000..3ed6527f4407c
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtryfault_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
new file mode 100644
index 0000000000000..f3eae8f21ff34
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj
deleted file mode 100644
index 891fe8891b5ad..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj
deleted file mode 100644
index d89d0cf350939..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.il
new file mode 100644
index 0000000000000..48b7b003ca919
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtryfault_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
new file mode 100644
index 0000000000000..d947ce8818cde
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il
index 93f2aad0f71cb..7f7c233008c3c 100644
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally.il
@@ -9,7 +9,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'throwinnestedtryfinally' {}
+.assembly ASSEMBLY_NAME {}
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.il
new file mode 100644
index 0000000000000..14451b4060055
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtryfinally_d"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
new file mode 100644
index 0000000000000..25023ec61ffbd
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
@@ -0,0 +1,14 @@
+
+
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj
deleted file mode 100644
index 55e41ff358069..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj
deleted file mode 100644
index 3979ccf232c27..0000000000000
--- a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.il b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.il
new file mode 100644
index 0000000000000..4591ecbcb1f52
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "throwinnestedtryfinally_r"
diff --git a/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
new file mode 100644
index 0000000000000..00391841664c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
@@ -0,0 +1,15 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
index 5b714ee9419de..4e9da97c89cb4 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly 'rethrowinfinallyinsidecatch' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.il b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.il
new file mode 100644
index 0000000000000..9b138176536ad
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rethrowinfinallyinsidecatch_d"
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
new file mode 100644
index 0000000000000..48e72ad541265
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj
deleted file mode 100644
index 70695dc268af6..0000000000000
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj
deleted file mode 100644
index 6b6ae456b2101..0000000000000
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_il_r.ilproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.il b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.il
new file mode 100644
index 0000000000000..0cf1d9c95d245
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rethrowinfinallyinsidecatch_r"
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
new file mode 100644
index 0000000000000..92c47075ecab5
--- /dev/null
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
@@ -0,0 +1,16 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c.il b/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
index a1d22ab45c76b..115b4f5553ce5 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_c'// as "refarg_c"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.il
new file mode 100644
index 0000000000000..a5bbc9f68e9b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_c_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj
index 2362ec1d48e4e..3b21e24321fee 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj
index 6e7cbc049f493..9bc5b35473339 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.il
new file mode 100644
index 0000000000000..91a81e009af5d
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_c_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
index e4c8406436982..a69d734c0296a 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_f4'// as "refarg_f4"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.il
new file mode 100644
index 0000000000000..c2076d5287b94
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_f4_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj
index 4a9fadfb264e3..f340d9f3e7e3d 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj
index b48147dd0546b..9a3fdfe2d4d5b 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.il
new file mode 100644
index 0000000000000..60d22bbfbf742
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_f4_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
index e4596537f2361..c120cdd986060 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_f8'// as "refarg_f8"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.il
new file mode 100644
index 0000000000000..485a7ae5f11d5
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_f8_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj
index a81fdca33825e..2a8921dc21ea3 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj
index 7badb7b119a90..db71b3d4a9c1c 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_il_r.ilproj
@@ -8,6 +8,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.il
new file mode 100644
index 0000000000000..5672472bcf20d
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_f8_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
index d202bedac9f6c..efdaf06027f32 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_i1'// as "refarg_i1"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.il
new file mode 100644
index 0000000000000..efcd559dc86c1
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_i1_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj
index 2f6c73edc4a7d..ddd3e89557643 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj
index 4961a0ddb930a..4290e5fee29ae 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.il
new file mode 100644
index 0000000000000..dc3965963d12d
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_i1_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
index bc6f45d732d69..845f9d076c1a0 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_i2'// as "refarg_i2"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.il
new file mode 100644
index 0000000000000..95a3eb5ad6fae
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_i2_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj
index 508594507cd85..0e3edf3d2e2d4 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_d.ilproj
@@ -8,6 +8,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj
index c47fa0423cb5b..aed120f909cf6 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_il_r.ilproj
@@ -8,6 +8,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.il
new file mode 100644
index 0000000000000..72b8c27fe8cce
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_i2_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
index 89931ac53898b..d2b83104b253f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_i4'// as "refarg_i4"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.il
new file mode 100644
index 0000000000000..cff1791860633
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_i4_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj
index 42df50490daf2..78a2ab8aa78b3 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj
index d194832da3120..f955de7b779c6 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_il_r.ilproj
@@ -8,6 +8,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.il
new file mode 100644
index 0000000000000..ed65a907d8a6c
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_i4_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o.il b/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
index 3098bde078697..e5c1def0b24e8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_o'// as "refarg_o"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.il
new file mode 100644
index 0000000000000..7bd5af6355b11
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_o_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj
index 0350eb6555d57..815dfadf417e4 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj
index 15bca25cc53da..81dff560590cd 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_il_r.ilproj
@@ -7,6 +7,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.il
new file mode 100644
index 0000000000000..c214089d7e41d
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_o_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s.il b/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
index 193130dc0b108..c016a32bb23fc 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_s'// as "refarg_s"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.il b/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.il
new file mode 100644
index 0000000000000..d003d4dc34a17
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_s_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj
index e626971153d8a..83149167e3932 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_d.ilproj
@@ -7,6 +7,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj
index c2a0a6d8ea968..500f5c5f384a9 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_il_r.ilproj
@@ -8,6 +8,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.il b/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.il
new file mode 100644
index 0000000000000..75f9e0fd40f89
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_s_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c.il b/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
index a133effd3ffdc..69c49c80dbc34 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_c'// as "refloc_c"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_c_d.il
new file mode 100644
index 0000000000000..f48dcf06f7525
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_c_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_c_d.ilproj
new file mode 100644
index 0000000000000..18cdf44421432
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c_d.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj
deleted file mode 100644
index ca5426675d9a0..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj
deleted file mode 100644
index 17f4aff6a3365..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_c_r.il
new file mode 100644
index 0000000000000..6bfd9f2f37f06
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_c_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_c_r.ilproj
new file mode 100644
index 0000000000000..d6da2541e1c08
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
index 4c0bc0710ffcd..afcdb4cc9e996 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_i1'// as "refloc_i1"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_d.il
new file mode 100644
index 0000000000000..933b08873e51e
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_i1_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_d.ilproj
new file mode 100644
index 0000000000000..e2ea66143253e
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_d.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj
deleted file mode 100644
index 61bc6a05ba6cc..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj
deleted file mode 100644
index 96efeac0292fe..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_r.il
new file mode 100644
index 0000000000000..7952c15ed2767
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_i1_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_r.ilproj
new file mode 100644
index 0000000000000..deb216ae96514
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
index 5ac3a11295a67..b5100e4aa43d8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_i2'// as "refloc_i2"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_d.il
new file mode 100644
index 0000000000000..097dd4320ca26
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_i2_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_d.ilproj
new file mode 100644
index 0000000000000..8a5cd7aa07df3
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_d.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj
deleted file mode 100644
index e2800ff4d06ed..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj
deleted file mode 100644
index 548caa96b1340..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_r.il
new file mode 100644
index 0000000000000..d8c23fcd50968
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_i2_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_r.ilproj
new file mode 100644
index 0000000000000..0f216ba6215c8
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
index c2a895f62219a..7188c7c02e030 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_i4'// as "refloc_i4"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_d.il
new file mode 100644
index 0000000000000..5a4210ecabce9
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_i4_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_d.ilproj
new file mode 100644
index 0000000000000..9c56a97af2c81
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj
deleted file mode 100644
index c3989afb3f50b..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj
deleted file mode 100644
index dcb9eaf69c9bc..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_r.il
new file mode 100644
index 0000000000000..5473bcc58452c
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_i4_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_r.ilproj
new file mode 100644
index 0000000000000..07470d0279c05
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
index 9c607f1415de2..de2546b5a8541 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_o'// as "refloc_o"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
index 72563a8c8fdff..026c2d45e0a2e 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_o2'// as "refloc_o"
+.assembly ASSEMBLY_NAME// as "refloc_o"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_d.il
new file mode 100644
index 0000000000000..0055a6cf7b0eb
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_o2_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_d.ilproj
new file mode 100644
index 0000000000000..3a7cc1afb0ddc
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj
deleted file mode 100644
index 9d84535c4f404..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj
deleted file mode 100644
index c2212206f5b3a..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_r.il
new file mode 100644
index 0000000000000..5497a0af4d875
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_o2_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_r.ilproj
new file mode 100644
index 0000000000000..b88d2d3cdaed4
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o_d.il
new file mode 100644
index 0000000000000..54863cca2959b
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_o_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o_d.ilproj
new file mode 100644
index 0000000000000..570b5150df036
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o_d.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj
deleted file mode 100644
index ebd156485c3ca..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj
deleted file mode 100644
index da5015b70a8de..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o_r.il
new file mode 100644
index 0000000000000..4737260833deb
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_o_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_o_r.ilproj
new file mode 100644
index 0000000000000..0ee20e4b40543
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
index 2cc84e8758adb..023c6ae1a36df 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_r4'// as "refloc_f4"
+.assembly ASSEMBLY_NAME// as "refloc_f4"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_d.il
new file mode 100644
index 0000000000000..3820c31c4519e
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_r4_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_d.ilproj
new file mode 100644
index 0000000000000..1dfae27f5b988
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_d.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj
deleted file mode 100644
index ef5338b493396..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj
deleted file mode 100644
index 6e78b37ee57d9..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_r.il
new file mode 100644
index 0000000000000..e7140861c7f02
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_r4_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_r.ilproj
new file mode 100644
index 0000000000000..14533f10bfec7
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
index 59e2668bf9156..2c15cbfcdc83f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_r8'// as "refloc_f8"
+.assembly ASSEMBLY_NAME// as "refloc_f8"
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_d.il
new file mode 100644
index 0000000000000..4d4de42708920
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_r8_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_d.ilproj
new file mode 100644
index 0000000000000..4a0d4b71561fb
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj
deleted file mode 100644
index ca9eb2d92280d..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj
deleted file mode 100644
index 3fa55afeb1ec4..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_r.il
new file mode 100644
index 0000000000000..d96103f7a8002
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_r8_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_r.ilproj
new file mode 100644
index 0000000000000..01cea6c514394
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
index 7fab0710af778..f82ee9b89ae51 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refloc_u2'// as "refloc_u2"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_d.il b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_d.il
new file mode 100644
index 0000000000000..593cd6a036c35
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_u2_d"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_d.ilproj
new file mode 100644
index 0000000000000..d211cf8cb674b
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj
deleted file mode 100644
index a7c0f9d591aa4..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj
deleted file mode 100644
index eca2538c17267..0000000000000
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_r.il b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_r.il
new file mode 100644
index 0000000000000..fea0da7a0c710
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refloc_u2_r"
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2_r.ilproj b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_r.ilproj
new file mode 100644
index 0000000000000..d275650067519
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
index 7fe01e710f27b..d39d7eb4135b9 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'expl_funcptr_gc'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.il
new file mode 100644
index 0000000000000..55a50b3a1a5b6
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "expl_funcptr_gc_d"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
new file mode 100644
index 0000000000000..ee451274494b6
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj
deleted file mode 100644
index 77520d5471502..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj
deleted file mode 100644
index 55c02529a3801..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.il
new file mode 100644
index 0000000000000..0dacf8e016a3e
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "expl_funcptr_gc_r"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
new file mode 100644
index 0000000000000..b4e30d77fb296
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
index 57a62581525a9..02ec7c6fb5234 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
@@ -10,7 +10,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'expl_funcptr_val'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.il
new file mode 100644
index 0000000000000..b9b726c5ed9d6
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "expl_funcptr_val_d"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
new file mode 100644
index 0000000000000..ae50bdab518df
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj
deleted file mode 100644
index dfd6e7f03197c..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj
deleted file mode 100644
index 1ca90331cbbb1..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.il
new file mode 100644
index 0000000000000..cdca9d8136874
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "expl_funcptr_val_r"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
new file mode 100644
index 0000000000000..b2a053c73f3e3
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
index b0367a9cda0ed..0cf1f30d507b3 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'seq_funcptr_gc'
+.assembly ASSEMBLY_NAME
{
}
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.il
new file mode 100644
index 0000000000000..1f4f47aec5121
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "seq_funcptr_gc_d"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
new file mode 100644
index 0000000000000..ba023d8e11536
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj
deleted file mode 100644
index d9e0c6d5b3d60..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj
deleted file mode 100644
index a70e153532640..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.il
new file mode 100644
index 0000000000000..d280ae13132e6
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "seq_funcptr_gc_r"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
new file mode 100644
index 0000000000000..10b1e10159d83
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
index 24273b23717ed..bf74bef366c3d 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'seq_funcptr_val'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.il
new file mode 100644
index 0000000000000..bf10da35fff98
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "seq_funcptr_val_d"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
new file mode 100644
index 0000000000000..207f199ac3cb2
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj
deleted file mode 100644
index f29696925f214..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj
deleted file mode 100644
index 9ac1152ab3a9f..0000000000000
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.il
new file mode 100644
index 0000000000000..c9e2e2a0ff511
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "seq_funcptr_val_r"
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
new file mode 100644
index 0000000000000..d2c0834799826
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
index ede1066c7adb3..1adea429faaa9 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_box_f8'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_d.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_d.il
new file mode 100644
index 0000000000000..90c62539dc7ac
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_box_f8_d"
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_d.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_d.ilproj
new file mode 100644
index 0000000000000..628fd17fe3d2a
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_d.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj
deleted file mode 100644
index ac227715a3f31..0000000000000
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj
deleted file mode 100644
index 79f7d401d4d33..0000000000000
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_r.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_r.il
new file mode 100644
index 0000000000000..c5562d84611c6
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_box_f8_r"
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_r.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_r.ilproj
new file mode 100644
index 0000000000000..bc975f1e6f78f
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8_r.ilproj
@@ -0,0 +1,13 @@
+
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
index 5fe05b673edf4..54b9f35ddf13d 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refarg_box_val'// as "refarg_box_val"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_d.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_d.il
new file mode 100644
index 0000000000000..5566db164ccde
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_box_val_d"
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_d.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_d.ilproj
new file mode 100644
index 0000000000000..c0cfb2fca1030
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj
deleted file mode 100644
index d16d322f4f406..0000000000000
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj
deleted file mode 100644
index d2965351077bd..0000000000000
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_r.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_r.il
new file mode 100644
index 0000000000000..5d3fa69c257f3
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refarg_box_val_r"
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_r.ilproj b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_r.ilproj
new file mode 100644
index 0000000000000..4bc47b41b4cfd
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
index 3f8542d9a9c4c..d139297a38eca 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'rotarg_double'// as "rotarg_double"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.il
new file mode 100644
index 0000000000000..696ed93469024
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_double_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj
index a9b101dba2909..f8e462963d4bb 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj
index 83989dedf6b1c..d26448deef9c1 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.il
new file mode 100644
index 0000000000000..5de20db7e1ff2
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_double_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
index 6c00383ed73fa..8801d20e9019b 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'rotarg_float'// as "rotarg_float"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.il
new file mode 100644
index 0000000000000..6c5df7015e623
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_float_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj
index e879cab61b53c..465986d67fe87 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj
index 92d05f1d6d763..277f9faedab0a 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.il
new file mode 100644
index 0000000000000..c1dee1555a4b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_float_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
index 6220f94f9d470..ac845e10d2c93 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'rotarg_objref'// as "rotarg_objref"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.il
new file mode 100644
index 0000000000000..09b9953e855a5
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_objref_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj
index edb37498285b9..da90b45066423 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj
index 22e04dbf80aaf..dbaf141ebd024 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.il
new file mode 100644
index 0000000000000..400e2803f522e
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_objref_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
index 805e572b8a7f0..6ad888e5cbef3 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'rotarg_valref'// as "rotarg_valref"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.il
new file mode 100644
index 0000000000000..310bf898d5c65
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_valref_il_d"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj
index 453efb638ade8..7cdeb89bc1cb4 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj
index 48eea6d7eb76e..6dd530266e624 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.il
new file mode 100644
index 0000000000000..ab67e9a129bdb
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotarg_valref_il_r"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
index 5ff441ef29cd8..9367575a69288 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'rotate_i4'// as "rotate_i4"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_d.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_d.il
new file mode 100644
index 0000000000000..6293267eaed14
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotate_i4_d"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_d.ilproj
new file mode 100644
index 0000000000000..4f3718b53c59e
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj
deleted file mode 100644
index 1815700636c57..0000000000000
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj
deleted file mode 100644
index 03d77c5ed21ea..0000000000000
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_r.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_r.il
new file mode 100644
index 0000000000000..2d6b9ed107311
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotate_i4_r"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_r.ilproj
new file mode 100644
index 0000000000000..d21695ee65dd7
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
index df02ff35ee04b..7a71aa327e755 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
@@ -9,7 +9,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'rotate_u2'// as "rotate_u2"
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_d.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_d.il
new file mode 100644
index 0000000000000..fe6b3ad687248
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotate_u2_d"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_d.ilproj
new file mode 100644
index 0000000000000..57466498ec42b
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj
deleted file mode 100644
index 9d0df382b82bb..0000000000000
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj
deleted file mode 100644
index 773f136589842..0000000000000
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_r.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_r.il
new file mode 100644
index 0000000000000..c182262fb952b
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rotate_u2_r"
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_r.ilproj b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_r.ilproj
new file mode 100644
index 0000000000000..26aedded29941
--- /dev/null
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
index c9d6646e3aba8..f14c399671a2d 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
@@ -11,7 +11,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
-.assembly 'twoEndFinallys'
+.assembly twoEndFinallys_r
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_r.ilproj
similarity index 100%
rename from src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il_r.ilproj
rename to src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_r.ilproj
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim.il b/src/tests/JIT/Methodical/int64/arrays/hugedim.il
index 3dbd19c2d6a07..4891e46c2fc52 100644
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim.il
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'hugedim'
+.assembly ASSEMBLY_NAME
{
// .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_d.il b/src/tests/JIT/Methodical/int64/arrays/hugedim_d.il
new file mode 100644
index 0000000000000..a4b963c384228
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "hugedim_d"
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/hugedim_d.ilproj
new file mode 100644
index 0000000000000..06887d2d4dbb1
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj
deleted file mode 100644
index 7b29826b51b83..0000000000000
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj
deleted file mode 100644
index 851eaa94cc378..0000000000000
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_r.il b/src/tests/JIT/Methodical/int64/arrays/hugedim_r.il
new file mode 100644
index 0000000000000..79919c6e3878a
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "hugedim_r"
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/hugedim_r.ilproj
new file mode 100644
index 0000000000000..4ce68a040e59c
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long.il b/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
index d5d26d7ef05dc..2902ae5217d10 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'lcs_long'// as "lcs_long"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.il b/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.il
new file mode 100644
index 0000000000000..c92ceb9035731
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_long_il_d"
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj
index 4819a22a25329..dac855f2af926 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj
index 7fff9d2a8d090..5d858c3205788 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.il b/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.il
new file mode 100644
index 0000000000000..88541b5d9595e
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_long_il_r"
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
index d374c8cc91e11..03c8845b7fd77 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'lcs_ulong'// as "lcs_ulong"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.il b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.il
new file mode 100644
index 0000000000000..55b4ecf20c6da
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_ulong_il_d"
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj
index b49de1e7ca264..ddac997bf5c12 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj
index 4810c0a3cd139..8b19e25f8c270 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.il b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.il
new file mode 100644
index 0000000000000..0eab68917fe78
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_ulong_il_r"
diff --git a/src/tests/JIT/Methodical/int64/misc/binop.il b/src/tests/JIT/Methodical/int64/misc/binop.il
index a73e0b6ba3aa7..62352c2344804 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop.il
+++ b/src/tests/JIT/Methodical/int64/misc/binop.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'binop'// as "binop"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_d.il b/src/tests/JIT/Methodical/int64/misc/binop_d.il
new file mode 100644
index 0000000000000..1538867655577
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/misc/binop_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "binop_il_d"
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj b/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj
index d81a8a6317799..daddd46675a8a 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj b/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj
index 7c4cc30d508dc..8611dbaab5de3 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/binop_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/misc/binop_r.il b/src/tests/JIT/Methodical/int64/misc/binop_r.il
new file mode 100644
index 0000000000000..4b53542e6fd5e
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/misc/binop_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "binop_il_r"
diff --git a/src/tests/JIT/Methodical/int64/misc/box.il b/src/tests/JIT/Methodical/int64/misc/box.il
index fb63291962b71..989538d74f568 100644
--- a/src/tests/JIT/Methodical/int64/misc/box.il
+++ b/src/tests/JIT/Methodical/int64/misc/box.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'box'// as "box"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/misc/box_d.il b/src/tests/JIT/Methodical/int64/misc/box_d.il
new file mode 100644
index 0000000000000..3248517ffcf17
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/misc/box_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "box_il_d"
diff --git a/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj b/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj
index 6f0e0265ac8af..2a4a9e0599a46 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj b/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj
index 641a80f99b1ba..f91f6a9cb2b25 100644
--- a/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/misc/box_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/misc/box_r.il b/src/tests/JIT/Methodical/int64/misc/box_r.il
new file mode 100644
index 0000000000000..8f6d665d70f53
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/misc/box_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "box_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub.il b/src/tests/JIT/Methodical/int64/signed/s_addsub.il
index c9c5d902157dd..74f57b8165f80 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_addsub'// as "addsub"
+.assembly ASSEMBLY_NAME// as "addsub"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_d.il b/src/tests/JIT/Methodical/int64/signed/s_addsub_d.il
new file mode 100644
index 0000000000000..5aca801519051
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_addsub_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj
index 08b8accd65b4a..80899c78cac43 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj
index 79054e11b43fa..3dae01d2fd5eb 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub_r.il b/src/tests/JIT/Methodical/int64/signed/s_addsub_r.il
new file mode 100644
index 0000000000000..56b7a4203f63c
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_addsub_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
index 792af2753b793..a95cb4334d68e 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldc_div'// as "ldc_div"
+.assembly ASSEMBLY_NAME// as "ldc_div"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.il
new file mode 100644
index 0000000000000..2dcd5b5e7b9c2
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldc_div_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj
index 24d551ce9ed31..3a1141e52af71 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj
index b2cd5c9b57dc9..ea39e4e18ee97 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.il
new file mode 100644
index 0000000000000..3a82cb37aa438
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldc_div_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
index d0a9809f01a54..a6d6bad2fb0c7 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldc_mul'// as "ldc_mul"
+.assembly ASSEMBLY_NAME// as "ldc_mul"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.il
new file mode 100644
index 0000000000000..80cfb29b4f966
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldc_mul_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj
index 55cd56f9a3600..c9e6498bd80f6 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj
index fab28a449799e..f60f3212a0313 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.il
new file mode 100644
index 0000000000000..7e84d9a5e0a30
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldc_mul_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
index 4db98feec4b39..300cf9a04c1c7 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldc_mulovf'// as "ldc_mulovf"
+.assembly ASSEMBLY_NAME// as "ldc_mulovf"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.il
new file mode 100644
index 0000000000000..3ef7888a41f7d
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldc_mulovf_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj
index 5a4dd60d62a73..84df4d06509b3 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj
index 782d874498e9b..c1a3c21e975b1 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.il
new file mode 100644
index 0000000000000..19f1f36ae4b77
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldc_mulovf_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
index 8db456f02b603..5c38ed9697f45 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldfld_mul'// as "ldfld_mul"
+.assembly ASSEMBLY_NAME// as "ldfld_mul"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.il
new file mode 100644
index 0000000000000..0cae5465aaa1c
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldfld_mul_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj
index 54d30df0404b9..d9fcff1356529 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj
index 9da5b7f81222f..33648e59348cb 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.il
new file mode 100644
index 0000000000000..2c2121eb74f52
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldfld_mul_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
index 560aff3655d38..8af97373e6bb0 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldfld_mulovf'// as "ldfld_mulovf"
+.assembly ASSEMBLY_NAME// as "ldfld_mulovf"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.il
new file mode 100644
index 0000000000000..956580cf24c96
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldfld_mulovf_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj
index d9cf09af5a43e..2eeb8264a8ba2 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj
index d862fa9b670dd..e5dc5c44293de 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.il
new file mode 100644
index 0000000000000..46dc73f89ddcb
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldfld_mulovf_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
index 9e38262ba3199..ce386174ee6a9 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldsfld_mul'// as "ldsfld_mul"
+.assembly ASSEMBLY_NAME// as "ldsfld_mul"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.il
new file mode 100644
index 0000000000000..492a2e96eab9d
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldsfld_mul_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj
index f2ca07d0fcbfb..3988481c72163 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj
index e3860b7a2f637..c25922d0fa4ea 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.il
new file mode 100644
index 0000000000000..bc597b0b8660b
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldsfld_mul_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
index 85ff433f2c02c..4b3c76e425936 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_ldsfld_mulovf'// as "ldsfld_mulovf"
+.assembly ASSEMBLY_NAME// as "ldsfld_mulovf"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.il
new file mode 100644
index 0000000000000..dda5e559e7bfa
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldsfld_mulovf_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj
index 94567a2d8de58..33fe6ec5997ad 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj
index 4269c2dab200d..a3d0fcec64aa4 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.il
new file mode 100644
index 0000000000000..bba250db4f45c
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_ldsfld_mulovf_il_r"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv.il b/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
index 57128ee14ba77..6162035bab6e4 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 's_muldiv'// as "muldiv"
+.assembly ASSEMBLY_NAME// as "muldiv"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.il b/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.il
new file mode 100644
index 0000000000000..0a8efd521084e
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_muldiv_il_d"
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj
index 17b61f5e4b3b7..7198d6cc20dc7 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj
index e382f9b10f652..8ee0b4c35d020 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.il b/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.il
new file mode 100644
index 0000000000000..0bf901bf41578
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "s_muldiv_il_r"
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong.il b/src/tests/JIT/Methodical/int64/superlong/superlong.il
index 818cc265ced00..33349073a8e36 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong.il
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'superlong'// as "superlong"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_d.il b/src/tests/JIT/Methodical/int64/superlong/superlong_d.il
new file mode 100644
index 0000000000000..9443f646b5d87
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "superlong_il_d"
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj b/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj
index 332924c902cc5..2b07bc3fe543a 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj b/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj
index 7257e415c8d26..c813e959a1f41 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong_r.il b/src/tests/JIT/Methodical/int64/superlong/superlong_r.il
new file mode 100644
index 0000000000000..7f5b97ded9129
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "superlong_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub.il b/src/tests/JIT/Methodical/int64/unsigned/addsub.il
index 02dfe614dfec1..71ed4a2ed6921 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'addsub'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_d.il b/src/tests/JIT/Methodical/int64/unsigned/addsub_d.il
new file mode 100644
index 0000000000000..315aa6eab6ae8
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "addsub_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj
index 618ae17c89d6a..2dd0012575116 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj
index 64480618a9bc1..df6272f946f11 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub_r.il b/src/tests/JIT/Methodical/int64/unsigned/addsub_r.il
new file mode 100644
index 0000000000000..154d00e993c66
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "addsub_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
index eb2ce4c044df2..91cbffd6759de 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldc_mul'// as "ldc_mul"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.il
new file mode 100644
index 0000000000000..8b3a9c3aa2cca
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldc_mul_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj
index 2d103beb3f89e..2b66eb1622d72 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj
index 03ef99a641190..d36a2e407bc2b 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.il
new file mode 100644
index 0000000000000..67a18c3eb0b64
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldc_mul_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
index 767d7e7f366dd..a03592e7b0dfb 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldc_mulovf'// as "ldc_mulovf"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.il
new file mode 100644
index 0000000000000..fe7ebf25df4d9
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldc_mulovf_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj
index a4982ef9d8d0e..62e40c3141b45 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj
index c534d05323799..4ab112874eed8 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.il
new file mode 100644
index 0000000000000..3f286bc4750fb
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldc_mulovf_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
index e9e2038790592..06b570c2a0a82 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
@@ -13,7 +13,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldfld_mul'// as "ldfld_mul"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.il
new file mode 100644
index 0000000000000..24cb311429a21
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfld_mul_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj
index f7a2c8f059f67..ba6954c91024b 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj
index 64a5f3445d2ef..54f8d1a47d0bc 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.il
new file mode 100644
index 0000000000000..dfc369191e17b
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfld_mul_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
index f940f9a4abe6e..c18923ea42164 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
@@ -12,7 +12,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldfld_mulovf'// as "ldfld_mulovf"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.il
new file mode 100644
index 0000000000000..fe452065db370
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfld_mulovf_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj
index 6a76fb5f99672..2cb84b3b0454f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj
index 4a67efa77b7eb..07f4490a1b2e9 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.il
new file mode 100644
index 0000000000000..0b152997ea2c0
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldfld_mulovf_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
index 18c2e00b0f8ee..85e1c87b0503f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldsfld_mul'// as "ldsfld_mul"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.il
new file mode 100644
index 0000000000000..38d27e26fcf8a
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldsfld_mul_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj
index 4b8973d47f799..6475a700fbb2f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj
index a1924e1fc983e..4daad482b83ce 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.il
new file mode 100644
index 0000000000000..0ebf7cf7af1b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldsfld_mul_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
index 0bf6177084c10..09c7227467206 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldsfld_mulovf'// as "ldsfld_mulovf"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.il
new file mode 100644
index 0000000000000..fb21abd4efc9a
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldsfld_mulovf_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj
index 802a1f67ac4ee..23b4fdc30bb90 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj
index d953e1990ca05..4dc5302bbea5f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.il
new file mode 100644
index 0000000000000..5bd6300cd85d3
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldsfld_mulovf_il_r"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv.il b/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
index 9592bbe7bf8ae..8fef507ab4232 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'muldiv'// as "muldiv"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.il b/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.il
new file mode 100644
index 0000000000000..4b12bf029bf76
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "muldiv_il_d"
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj
index beab4de2ce715..4a3f52be2d86c 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_d.ilproj
@@ -5,6 +5,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj
index b7c6786ce5397..823de3a665cda 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_il_r.ilproj
@@ -5,6 +5,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.il b/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.il
new file mode 100644
index 0000000000000..318d7d26bac19
--- /dev/null
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "muldiv_il_r"
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken.il b/src/tests/JIT/Methodical/ldtoken/ldtoken.il
index c5dbc73c6feff..b9ae3da9bb51b 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtoken.il
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldtoken'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_d.il b/src/tests/JIT/Methodical/ldtoken/ldtoken_d.il
new file mode 100644
index 0000000000000..5bb4dbc573e92
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldtoken_d"
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtoken_d.ilproj
new file mode 100644
index 0000000000000..ef0f18f3e4596
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj
deleted file mode 100644
index f5db96666bf5f..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj
deleted file mode 100644
index 0a1a065a33f3f..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/ldtoken_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_r.il b/src/tests/JIT/Methodical/ldtoken/ldtoken_r.il
new file mode 100644
index 0000000000000..f14b925133240
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldtoken_r"
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtoken_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtoken_r.ilproj
new file mode 100644
index 0000000000000..fd8b07b2e3c47
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtoken_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena.il b/src/tests/JIT/Methodical/ldtoken/ldtokena.il
index 176de66190102..46f50306ada64 100644
--- a/src/tests/JIT/Methodical/ldtoken/ldtokena.il
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldtokena
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_d.il b/src/tests/JIT/Methodical/ldtoken/ldtokena_d.il
new file mode 100644
index 0000000000000..c67b912a01481
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldtokena_d"
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtokena_d.ilproj
new file mode 100644
index 0000000000000..5aa8ef1cf9d79
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj
deleted file mode 100644
index 7e026072a8f9e..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj
deleted file mode 100644
index e4fb05c9723f2..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/ldtokena_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_r.il b/src/tests/JIT/Methodical/ldtoken/ldtokena_r.il
new file mode 100644
index 0000000000000..07dac63f1264a
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldtokena_r"
diff --git a/src/tests/JIT/Methodical/ldtoken/ldtokena_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ldtokena_r.ilproj
new file mode 100644
index 0000000000000..13e1ab9e3be01
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ldtokena_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types.il b/src/tests/JIT/Methodical/ldtoken/ptr_types.il
index 548f9a90580f6..677a5d10c31ab 100644
--- a/src/tests/JIT/Methodical/ldtoken/ptr_types.il
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ptr_types { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ptr_types_ldtoken_il
{
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_d.il b/src/tests/JIT/Methodical/ldtoken/ptr_types_d.il
new file mode 100644
index 0000000000000..c3169c1ad2888
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ptr_types_d"
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ptr_types_d.ilproj
new file mode 100644
index 0000000000000..a6de33f2373a3
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj
deleted file mode 100644
index 425955ef65d0b..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj
deleted file mode 100644
index b3acccf7fba4b..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/ptr_types_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_r.il b/src/tests/JIT/Methodical/ldtoken/ptr_types_r.il
new file mode 100644
index 0000000000000..129b888324727
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ptr_types_r"
diff --git a/src/tests/JIT/Methodical/ldtoken/ptr_types_r.ilproj b/src/tests/JIT/Methodical/ldtoken/ptr_types_r.ilproj
new file mode 100644
index 0000000000000..5f418e21b5d7c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/ptr_types_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/types.il b/src/tests/JIT/Methodical/ldtoken/types.il
index 79f3b98d29c23..9820b58ccfcc5 100644
--- a/src/tests/JIT/Methodical/ldtoken/types.il
+++ b/src/tests/JIT/Methodical/ldtoken/types.il
@@ -6,7 +6,7 @@
.assembly extern System.Console { auto }
.assembly extern mscorlib { auto }
-.assembly types { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_types_ldtoken_il
{
diff --git a/src/tests/JIT/Methodical/ldtoken/types_d.il b/src/tests/JIT/Methodical/ldtoken/types_d.il
new file mode 100644
index 0000000000000..81361347fc193
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/types_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "types_d"
diff --git a/src/tests/JIT/Methodical/ldtoken/types_d.ilproj b/src/tests/JIT/Methodical/ldtoken/types_d.ilproj
new file mode 100644
index 0000000000000..257e8638c1bac
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/types_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj b/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj
deleted file mode 100644
index 5effeef20592a..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/types_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj b/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj
deleted file mode 100644
index 59849568fc4bd..0000000000000
--- a/src/tests/JIT/Methodical/ldtoken/types_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/ldtoken/types_r.il b/src/tests/JIT/Methodical/ldtoken/types_r.il
new file mode 100644
index 0000000000000..ca39704abd9cb
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/types_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "types_r"
diff --git a/src/tests/JIT/Methodical/ldtoken/types_r.ilproj b/src/tests/JIT/Methodical/ldtoken/types_r.ilproj
new file mode 100644
index 0000000000000..7beb2128a934c
--- /dev/null
+++ b/src/tests/JIT/Methodical/ldtoken/types_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic.il b/src/tests/JIT/Methodical/nonvirtualcall/classic.il
index 6eaeded7ecc14..53530ea8e5e89 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic.il
@@ -16,7 +16,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 2:0:0:0
}
-.assembly classic
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.hash algorithm 0x00008004
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_d.il b/src/tests/JIT/Methodical/nonvirtualcall/classic_d.il
new file mode 100644
index 0000000000000..967a209684e86
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "classic_d"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_d.ilproj
new file mode 100644
index 0000000000000..ec206c30d659a
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj
deleted file mode 100644
index 1729e3cae721f..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj
deleted file mode 100644
index 071e8d6f3fe63..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_r.il b/src/tests/JIT/Methodical/nonvirtualcall/classic_r.il
new file mode 100644
index 0000000000000..d8d9904a93f86
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "classic_r"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/classic_r.ilproj
new file mode 100644
index 0000000000000..be4ea41cb1faf
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate.il b/src/tests/JIT/Methodical/nonvirtualcall/delegate.il
index 00a20015f576c..35da7c8c54f85 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate.il
@@ -16,7 +16,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 2:0:0:0
}
-.assembly delegate
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.hash algorithm 0x00008004
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.il b/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.il
new file mode 100644
index 0000000000000..89ff64d63157c
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "delegate_d"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
new file mode 100644
index 0000000000000..0da14098c0499
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj
deleted file mode 100644
index ef4189411d959..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj
deleted file mode 100644
index 2d501f7ecd1e0..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.il b/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.il
new file mode 100644
index 0000000000000..44990e1b7334e
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "delegate_r"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
new file mode 100644
index 0000000000000..952ff8821dc85
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics.il b/src/tests/JIT/Methodical/nonvirtualcall/generics.il
index 9bbb9f408d822..bf466e0dfb166 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics.il
@@ -16,7 +16,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 2:0:0:0
}
-.assembly generics
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.hash algorithm 0x00008004
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2.il b/src/tests/JIT/Methodical/nonvirtualcall/generics2.il
index c75da589bb866..f30499bb8aa27 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2.il
@@ -17,7 +17,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 2:0:0:0
}
-.assembly generics2
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.hash algorithm 0x00008004
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.il b/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.il
new file mode 100644
index 0000000000000..f1edc0d42a9f4
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "generics2_d"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
new file mode 100644
index 0000000000000..c0fffaeec6270
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj
deleted file mode 100644
index f38835efec87f..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj
deleted file mode 100644
index b24463a3b4e2d..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.il b/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.il
new file mode 100644
index 0000000000000..585d3184c2c2c
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "generics2_r"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
new file mode 100644
index 0000000000000..3e1340064e263
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_d.il b/src/tests/JIT/Methodical/nonvirtualcall/generics_d.il
new file mode 100644
index 0000000000000..8bea97f85b88b
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "generics_d"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_d.ilproj
new file mode 100644
index 0000000000000..bfcee100ee62c
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj
deleted file mode 100644
index 0923a34d7892a..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj
deleted file mode 100644
index 93319f39fc620..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_r.il b/src/tests/JIT/Methodical/nonvirtualcall/generics_r.il
new file mode 100644
index 0000000000000..84acd5894ef1a
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "generics_r"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/generics_r.ilproj
new file mode 100644
index 0000000000000..bbf9d7629d344
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il
index e90fa8930c98e..475d8326b5802 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il
@@ -6,7 +6,7 @@
// Metadata version: v2.0.50509
.assembly extern mscorlib { auto }
-.assembly tailcall_nonvirtualcall
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.hash algorithm 0x00008004
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_d.il b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_d.il
new file mode 100644
index 0000000000000..333f2dadbad63
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tailcall_nonvirtualcall_d"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_d.ilproj
new file mode 100644
index 0000000000000..df19e1754d7c6
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj
deleted file mode 100644
index 1c0683d197200..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj
deleted file mode 100644
index cf24f4f222aee..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_r.ilproj
new file mode 100644
index 0000000000000..d5b7603ae388f
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_nonvirtualcall_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall_r.il b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_r.il
new file mode 100644
index 0000000000000..184c9d85fc435
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "tailcall_nonvirtualcall_r"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il
index 44bc21e2a7975..366b35f1bed68 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il
@@ -17,7 +17,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 2:0:0:0
}
-.assembly 'valuetype'
+.assembly ASSEMBLY_NAME
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.hash algorithm 0x00008004
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.il b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.il
new file mode 100644
index 0000000000000..317c636231dbf
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "valuetype_d"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
new file mode 100644
index 0000000000000..0d1425b8f4a0b
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj
deleted file mode 100644
index 30da4e7bb0071..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj
deleted file mode 100644
index 0abda7d67c081..0000000000000
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.il b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.il
new file mode 100644
index 0000000000000..698676b76d7d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "valuetype_r"
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
new file mode 100644
index 0000000000000..dfb837d46e402
--- /dev/null
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/array1.il b/src/tests/JIT/Methodical/refany/array1.il
index 3d0e36acae883..4128565a0ba87 100644
--- a/src/tests/JIT/Methodical/refany/array1.il
+++ b/src/tests/JIT/Methodical/refany/array1.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly array1// as "array1"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/array1_d.il b/src/tests/JIT/Methodical/refany/array1_d.il
new file mode 100644
index 0000000000000..4179b11b5185e
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array1_d"
diff --git a/src/tests/JIT/Methodical/refany/array1_d.ilproj b/src/tests/JIT/Methodical/refany/array1_d.ilproj
new file mode 100644
index 0000000000000..7366c31534ba1
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/array1_il_d.ilproj b/src/tests/JIT/Methodical/refany/array1_il_d.ilproj
deleted file mode 100644
index 02683ec625343..0000000000000
--- a/src/tests/JIT/Methodical/refany/array1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/array1_il_r.ilproj b/src/tests/JIT/Methodical/refany/array1_il_r.ilproj
deleted file mode 100644
index 6fcec02689b23..0000000000000
--- a/src/tests/JIT/Methodical/refany/array1_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/array1_r.il b/src/tests/JIT/Methodical/refany/array1_r.il
new file mode 100644
index 0000000000000..3618457ec1388
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array1_r"
diff --git a/src/tests/JIT/Methodical/refany/array1_r.ilproj b/src/tests/JIT/Methodical/refany/array1_r.ilproj
new file mode 100644
index 0000000000000..d1555689fdca3
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array1_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/array2.il b/src/tests/JIT/Methodical/refany/array2.il
index b593b4250ce66..5e88f1b5c1787 100644
--- a/src/tests/JIT/Methodical/refany/array2.il
+++ b/src/tests/JIT/Methodical/refany/array2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly array2// as "array2"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/array2_d.il b/src/tests/JIT/Methodical/refany/array2_d.il
new file mode 100644
index 0000000000000..a5941b82840cc
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array2_d"
diff --git a/src/tests/JIT/Methodical/refany/array2_d.ilproj b/src/tests/JIT/Methodical/refany/array2_d.ilproj
new file mode 100644
index 0000000000000..c51cb41b80fa4
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array2_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/array2_il_d.ilproj b/src/tests/JIT/Methodical/refany/array2_il_d.ilproj
deleted file mode 100644
index e25526c2b5ae8..0000000000000
--- a/src/tests/JIT/Methodical/refany/array2_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/array2_il_r.ilproj b/src/tests/JIT/Methodical/refany/array2_il_r.ilproj
deleted file mode 100644
index 98f56840ab472..0000000000000
--- a/src/tests/JIT/Methodical/refany/array2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/array2_r.il b/src/tests/JIT/Methodical/refany/array2_r.il
new file mode 100644
index 0000000000000..346f650fd800d
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array2_r"
diff --git a/src/tests/JIT/Methodical/refany/array2_r.ilproj b/src/tests/JIT/Methodical/refany/array2_r.ilproj
new file mode 100644
index 0000000000000..ef2a8c32540ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/array3.il b/src/tests/JIT/Methodical/refany/array3.il
index dc2e32b5a45b1..94b6f36363659 100644
--- a/src/tests/JIT/Methodical/refany/array3.il
+++ b/src/tests/JIT/Methodical/refany/array3.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'array3'// as "array2"
+.assembly ASSEMBLY_NAME// as "array2"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/array3_d.il b/src/tests/JIT/Methodical/refany/array3_d.il
new file mode 100644
index 0000000000000..889114bad1bf0
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array3_d"
diff --git a/src/tests/JIT/Methodical/refany/array3_d.ilproj b/src/tests/JIT/Methodical/refany/array3_d.ilproj
new file mode 100644
index 0000000000000..2947ee2909962
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array3_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/array3_il_d.ilproj b/src/tests/JIT/Methodical/refany/array3_il_d.ilproj
deleted file mode 100644
index a63c8328e13e5..0000000000000
--- a/src/tests/JIT/Methodical/refany/array3_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/array3_il_r.ilproj b/src/tests/JIT/Methodical/refany/array3_il_r.ilproj
deleted file mode 100644
index 5647e85ac916c..0000000000000
--- a/src/tests/JIT/Methodical/refany/array3_il_r.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/array3_r.il b/src/tests/JIT/Methodical/refany/array3_r.il
new file mode 100644
index 0000000000000..24f7a166a61da
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "array3_r"
diff --git a/src/tests/JIT/Methodical/refany/array3_r.ilproj b/src/tests/JIT/Methodical/refany/array3_r.ilproj
new file mode 100644
index 0000000000000..aec5544dab269
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/array3_r.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/format.il b/src/tests/JIT/Methodical/refany/format.il
index 00e10dc40056a..815c35849af8e 100644
--- a/src/tests/JIT/Methodical/refany/format.il
+++ b/src/tests/JIT/Methodical/refany/format.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly format// as "format"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/format_d.il b/src/tests/JIT/Methodical/refany/format_d.il
new file mode 100644
index 0000000000000..571f068a49802
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/format_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "format_d"
diff --git a/src/tests/JIT/Methodical/refany/format_d.ilproj b/src/tests/JIT/Methodical/refany/format_d.ilproj
new file mode 100644
index 0000000000000..64e72dffe6a3b
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/format_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/format_il_d.ilproj b/src/tests/JIT/Methodical/refany/format_il_d.ilproj
deleted file mode 100644
index 4e797afb117fd..0000000000000
--- a/src/tests/JIT/Methodical/refany/format_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/format_il_r.ilproj b/src/tests/JIT/Methodical/refany/format_il_r.ilproj
deleted file mode 100644
index b8f2212176f7b..0000000000000
--- a/src/tests/JIT/Methodical/refany/format_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/format_r.il b/src/tests/JIT/Methodical/refany/format_r.il
new file mode 100644
index 0000000000000..57aa31636c8e2
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/format_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "format_r"
diff --git a/src/tests/JIT/Methodical/refany/format_r.ilproj b/src/tests/JIT/Methodical/refany/format_r.ilproj
new file mode 100644
index 0000000000000..e0cf42889b001
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/format_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/indcall.il b/src/tests/JIT/Methodical/refany/indcall.il
index 6ffc8d78d2cdd..41e8d9cee5cc4 100644
--- a/src/tests/JIT/Methodical/refany/indcall.il
+++ b/src/tests/JIT/Methodical/refany/indcall.il
@@ -8,7 +8,7 @@
.assembly extern mscorlib
{
}
-.assembly 'indcall'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/refany/indcall_d.il b/src/tests/JIT/Methodical/refany/indcall_d.il
new file mode 100644
index 0000000000000..49a8381fee6bd
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/indcall_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "indcall_d"
diff --git a/src/tests/JIT/Methodical/refany/indcall_d.ilproj b/src/tests/JIT/Methodical/refany/indcall_d.ilproj
new file mode 100644
index 0000000000000..c33d27d0a981b
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/indcall_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj b/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj
deleted file mode 100644
index f5b7b930530b9..0000000000000
--- a/src/tests/JIT/Methodical/refany/indcall_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj b/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj
deleted file mode 100644
index 4673b153a91ed..0000000000000
--- a/src/tests/JIT/Methodical/refany/indcall_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/indcall_r.il b/src/tests/JIT/Methodical/refany/indcall_r.il
new file mode 100644
index 0000000000000..201e3c7f7558d
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/indcall_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "indcall_r"
diff --git a/src/tests/JIT/Methodical/refany/indcall_r.ilproj b/src/tests/JIT/Methodical/refany/indcall_r.ilproj
new file mode 100644
index 0000000000000..2728356d1666a
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/indcall_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/lcs.il b/src/tests/JIT/Methodical/refany/lcs.il
index cc4b5286a470d..d09cd2f835365 100644
--- a/src/tests/JIT/Methodical/refany/lcs.il
+++ b/src/tests/JIT/Methodical/refany/lcs.il
@@ -14,7 +14,7 @@
.assembly extern mscorlib
{
}
-.assembly lcs// as "lcs"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/lcs_d.il b/src/tests/JIT/Methodical/refany/lcs_d.il
new file mode 100644
index 0000000000000..d9c2ea34cf609
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/lcs_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_d"
diff --git a/src/tests/JIT/Methodical/refany/lcs_d.ilproj b/src/tests/JIT/Methodical/refany/lcs_d.ilproj
new file mode 100644
index 0000000000000..fe1aa6b6788f6
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/lcs_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj b/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj
deleted file mode 100644
index 57b153ec9224e..0000000000000
--- a/src/tests/JIT/Methodical/refany/lcs_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj b/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj
deleted file mode 100644
index 757c44937318f..0000000000000
--- a/src/tests/JIT/Methodical/refany/lcs_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/lcs_r.il b/src/tests/JIT/Methodical/refany/lcs_r.il
new file mode 100644
index 0000000000000..18d10ffa1db9f
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/lcs_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "lcs_r"
diff --git a/src/tests/JIT/Methodical/refany/lcs_r.ilproj b/src/tests/JIT/Methodical/refany/lcs_r.ilproj
new file mode 100644
index 0000000000000..b7d66c1604dfb
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/lcs_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/longsig.il b/src/tests/JIT/Methodical/refany/longsig.il
index 0590b19135144..3ddc685a3325a 100644
--- a/src/tests/JIT/Methodical/refany/longsig.il
+++ b/src/tests/JIT/Methodical/refany/longsig.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'longsig'// as "format"
+.assembly ASSEMBLY_NAME// as "format"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/longsig_d.il b/src/tests/JIT/Methodical/refany/longsig_d.il
new file mode 100644
index 0000000000000..85743277157e8
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/longsig_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "longsig_d"
diff --git a/src/tests/JIT/Methodical/refany/longsig_d.ilproj b/src/tests/JIT/Methodical/refany/longsig_d.ilproj
new file mode 100644
index 0000000000000..83a82529440da
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/longsig_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj b/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj
deleted file mode 100644
index 661ece118298f..0000000000000
--- a/src/tests/JIT/Methodical/refany/longsig_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj b/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj
deleted file mode 100644
index 6594f5cfbeec5..0000000000000
--- a/src/tests/JIT/Methodical/refany/longsig_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/longsig_r.il b/src/tests/JIT/Methodical/refany/longsig_r.il
new file mode 100644
index 0000000000000..e3c441bdd4273
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/longsig_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "longsig_r"
diff --git a/src/tests/JIT/Methodical/refany/longsig_r.ilproj b/src/tests/JIT/Methodical/refany/longsig_r.ilproj
new file mode 100644
index 0000000000000..93e2d1fd07828
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/longsig_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/native.il b/src/tests/JIT/Methodical/refany/native.il
index 073ae8d6f796e..044511719500b 100644
--- a/src/tests/JIT/Methodical/refany/native.il
+++ b/src/tests/JIT/Methodical/refany/native.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'native'// as "native"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/native_d.il b/src/tests/JIT/Methodical/refany/native_d.il
new file mode 100644
index 0000000000000..9fb60e1cdce25
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/native_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "native_il_d"
diff --git a/src/tests/JIT/Methodical/refany/native_il_d.ilproj b/src/tests/JIT/Methodical/refany/native_il_d.ilproj
index 655b244a7bad3..1987b2be90cad 100644
--- a/src/tests/JIT/Methodical/refany/native_il_d.ilproj
+++ b/src/tests/JIT/Methodical/refany/native_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/refany/native_il_r.ilproj b/src/tests/JIT/Methodical/refany/native_il_r.ilproj
index e8c2ff93b9908..edbb9fe4e2f89 100644
--- a/src/tests/JIT/Methodical/refany/native_il_r.ilproj
+++ b/src/tests/JIT/Methodical/refany/native_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/refany/native_r.il b/src/tests/JIT/Methodical/refany/native_r.il
new file mode 100644
index 0000000000000..801beea7c6f3e
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/native_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "native_il_r"
diff --git a/src/tests/JIT/Methodical/refany/seq.il b/src/tests/JIT/Methodical/refany/seq.il
index 107c09b991d1d..5a8e33ab44612 100644
--- a/src/tests/JIT/Methodical/refany/seq.il
+++ b/src/tests/JIT/Methodical/refany/seq.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'seq'// as "native"
+.assembly ASSEMBLY_NAME// as "native"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/seq_d.il b/src/tests/JIT/Methodical/refany/seq_d.il
new file mode 100644
index 0000000000000..a25de845ed3d4
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/seq_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "seq_d"
diff --git a/src/tests/JIT/Methodical/refany/seq_d.ilproj b/src/tests/JIT/Methodical/refany/seq_d.ilproj
new file mode 100644
index 0000000000000..bdd50eb4ba0f5
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/seq_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/seq_il_d.ilproj b/src/tests/JIT/Methodical/refany/seq_il_d.ilproj
deleted file mode 100644
index fce01ad048951..0000000000000
--- a/src/tests/JIT/Methodical/refany/seq_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/seq_il_r.ilproj b/src/tests/JIT/Methodical/refany/seq_il_r.ilproj
deleted file mode 100644
index 379df1b17c454..0000000000000
--- a/src/tests/JIT/Methodical/refany/seq_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/seq_r.il b/src/tests/JIT/Methodical/refany/seq_r.il
new file mode 100644
index 0000000000000..45a28dcaf4f8a
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/seq_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "seq_r"
diff --git a/src/tests/JIT/Methodical/refany/seq_r.ilproj b/src/tests/JIT/Methodical/refany/seq_r.ilproj
new file mode 100644
index 0000000000000..579cbcc86cee1
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/seq_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/shortsig.il b/src/tests/JIT/Methodical/refany/shortsig.il
index 7c3271f8f18a2..52a288ed3ee74 100644
--- a/src/tests/JIT/Methodical/refany/shortsig.il
+++ b/src/tests/JIT/Methodical/refany/shortsig.il
@@ -10,7 +10,7 @@
.assembly extern mscorlib
{
}
-.assembly 'shortsig'// as "format"
+.assembly ASSEMBLY_NAME// as "format"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/shortsig_d.il b/src/tests/JIT/Methodical/refany/shortsig_d.il
new file mode 100644
index 0000000000000..67257c9585566
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/shortsig_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "shortsig_d"
diff --git a/src/tests/JIT/Methodical/refany/shortsig_d.ilproj b/src/tests/JIT/Methodical/refany/shortsig_d.ilproj
new file mode 100644
index 0000000000000..4764fbe82d838
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/shortsig_d.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj b/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj
deleted file mode 100644
index 2e73cb8f13b3c..0000000000000
--- a/src/tests/JIT/Methodical/refany/shortsig_il_d.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj b/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj
deleted file mode 100644
index 46c263e17cc27..0000000000000
--- a/src/tests/JIT/Methodical/refany/shortsig_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- true
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/shortsig_r.il b/src/tests/JIT/Methodical/refany/shortsig_r.il
new file mode 100644
index 0000000000000..caabe3a3da8ae
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/shortsig_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "shortsig_r"
diff --git a/src/tests/JIT/Methodical/refany/shortsig_r.ilproj b/src/tests/JIT/Methodical/refany/shortsig_r.ilproj
new file mode 100644
index 0000000000000..84cb0fd8b35dc
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/shortsig_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ true
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/stress2.il b/src/tests/JIT/Methodical/refany/stress2.il
index 686d4317397c9..ead08460e995b 100644
--- a/src/tests/JIT/Methodical/refany/stress2.il
+++ b/src/tests/JIT/Methodical/refany/stress2.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly stress2// as "stress2"
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/stress2_d.il b/src/tests/JIT/Methodical/refany/stress2_d.il
new file mode 100644
index 0000000000000..c892fc6c2693c
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/stress2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stress2_d"
diff --git a/src/tests/JIT/Methodical/refany/stress2_d.ilproj b/src/tests/JIT/Methodical/refany/stress2_d.ilproj
new file mode 100644
index 0000000000000..2b3ef68c40bd6
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/stress2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj b/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj
deleted file mode 100644
index 960cf9c2b3a21..0000000000000
--- a/src/tests/JIT/Methodical/refany/stress2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj b/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj
deleted file mode 100644
index 901d2451a23cd..0000000000000
--- a/src/tests/JIT/Methodical/refany/stress2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/stress2_r.il b/src/tests/JIT/Methodical/refany/stress2_r.il
new file mode 100644
index 0000000000000..4d106dd4170c6
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/stress2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "stress2_r"
diff --git a/src/tests/JIT/Methodical/refany/stress2_r.ilproj b/src/tests/JIT/Methodical/refany/stress2_r.ilproj
new file mode 100644
index 0000000000000..5cbfbb1329d4b
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/stress2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/u_native.il b/src/tests/JIT/Methodical/refany/u_native.il
index a7b0690a4827d..fd3564389545e 100644
--- a/src/tests/JIT/Methodical/refany/u_native.il
+++ b/src/tests/JIT/Methodical/refany/u_native.il
@@ -11,7 +11,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'u_native'// as "native"
+.assembly ASSEMBLY_NAME// as "native"
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/u_native_d.il b/src/tests/JIT/Methodical/refany/u_native_d.il
new file mode 100644
index 0000000000000..31f9f2971dee4
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/u_native_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_native_d"
diff --git a/src/tests/JIT/Methodical/refany/u_native_d.ilproj b/src/tests/JIT/Methodical/refany/u_native_d.ilproj
new file mode 100644
index 0000000000000..3961a0c2c0dff
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/u_native_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj b/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj
deleted file mode 100644
index ad9ad59b7f4cb..0000000000000
--- a/src/tests/JIT/Methodical/refany/u_native_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj b/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj
deleted file mode 100644
index c8c08484784cc..0000000000000
--- a/src/tests/JIT/Methodical/refany/u_native_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/refany/u_native_r.il b/src/tests/JIT/Methodical/refany/u_native_r.il
new file mode 100644
index 0000000000000..63db15b5c2ad9
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/u_native_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "u_native_r"
diff --git a/src/tests/JIT/Methodical/refany/u_native_r.ilproj b/src/tests/JIT/Methodical/refany/u_native_r.ilproj
new file mode 100644
index 0000000000000..cf10d57a3b54b
--- /dev/null
+++ b/src/tests/JIT/Methodical/refany/u_native_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum.il b/src/tests/JIT/Methodical/tailcall/compat_enum.il
index 83ddafe1bb24b..c99be73e41661 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_enum.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_enum.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_enum { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_enum
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_d.il b/src/tests/JIT/Methodical/tailcall/compat_enum_d.il
new file mode 100644
index 0000000000000..dab6552ef8b37
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_enum_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_enum_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_enum_d.ilproj
new file mode 100644
index 0000000000000..425f5d8b78671
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_enum_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj
deleted file mode 100644
index fbeb666f8d6e9..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj
deleted file mode 100644
index 11d62074ebd1e..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_r.il b/src/tests/JIT/Methodical/tailcall/compat_enum_r.il
new file mode 100644
index 0000000000000..38077d6f60c26
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_enum_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_enum_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_enum_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_enum_r.ilproj
new file mode 100644
index 0000000000000..797266fc5e837
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_enum_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il b/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il
index 0a16393dc36e2..c3f7e6a1c3b96 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_i2_bool { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_i2_bool
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_d.il b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_d.il
new file mode 100644
index 0000000000000..4f468942eca17
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i2_bool_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_d.ilproj
new file mode 100644
index 0000000000000..d7b535836a483
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj
deleted file mode 100644
index 2c2e44aecf94f..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj
deleted file mode 100644
index 080985186a585..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_r.il b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_r.il
new file mode 100644
index 0000000000000..01c55efed23dd
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i2_bool_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i2_bool_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_r.ilproj
new file mode 100644
index 0000000000000..9fd808c7f7c5e
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i2_bool_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il b/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il
index 939b926e54e96..6e2d1d9cbbce0 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_i4_i1 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_i4_i1
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_d.il b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_d.il
new file mode 100644
index 0000000000000..9bde2c7253b20
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i4_i1_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_d.ilproj
new file mode 100644
index 0000000000000..0d65a38d4b1de
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj
deleted file mode 100644
index 600891f7996e9..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj
deleted file mode 100644
index c20bc759e0945..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_r.il b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_r.il
new file mode 100644
index 0000000000000..9d5da34c6924b
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i4_i1_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_i1_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_r.ilproj
new file mode 100644
index 0000000000000..dfef925dc2de0
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_i1_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u.il b/src/tests/JIT/Methodical/tailcall/compat_i4_u.il
index 65323764e5cca..86316dba58771 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_i4_u.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_i4_u { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_i4_u
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_d.il b/src/tests/JIT/Methodical/tailcall/compat_i4_u_d.il
new file mode 100644
index 0000000000000..3d9ec2e21a773
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i4_u_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_u_d.ilproj
new file mode 100644
index 0000000000000..5dd70dc3a42b8
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj
deleted file mode 100644
index 70f05a464216b..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj
deleted file mode 100644
index 111365cca0fc1..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_r.il b/src/tests/JIT/Methodical/tailcall/compat_i4_u_r.il
new file mode 100644
index 0000000000000..408dc76c52d73
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i4_u_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i4_u_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i4_u_r.ilproj
new file mode 100644
index 0000000000000..63d8ec0d8cad1
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i4_u_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2.il b/src/tests/JIT/Methodical/tailcall/compat_i_u2.il
index f51dc3b45fc3d..11697d0ecdeef 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_i_u2.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_i_u2 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_i_u2
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_d.il b/src/tests/JIT/Methodical/tailcall/compat_i_u2_d.il
new file mode 100644
index 0000000000000..7a560d24ad5ae
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i_u2_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i_u2_d.ilproj
new file mode 100644
index 0000000000000..9a7dba6bbf71f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj
deleted file mode 100644
index 16b7095cc8159..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj
deleted file mode 100644
index 70012ab43b9c4..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_r.il b/src/tests/JIT/Methodical/tailcall/compat_i_u2_r.il
new file mode 100644
index 0000000000000..739e15972d914
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_i_u2_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_i_u2_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_i_u2_r.ilproj
new file mode 100644
index 0000000000000..3b244f34712b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_i_u2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj.il b/src/tests/JIT/Methodical/tailcall/compat_obj.il
index b480b6c04abdf..d14bab60c8e6d 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_obj.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_obj.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_obj { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_obj
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_d.il b/src/tests/JIT/Methodical/tailcall/compat_obj_d.il
new file mode 100644
index 0000000000000..f66e8c0ae94d0
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_obj_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_obj_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_obj_d.ilproj
new file mode 100644
index 0000000000000..caacebe0fba99
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_obj_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj
deleted file mode 100644
index de50541bbbd54..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_obj_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj
deleted file mode 100644
index 5b7c737ae311f..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_obj_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_r.il b/src/tests/JIT/Methodical/tailcall/compat_obj_r.il
new file mode 100644
index 0000000000000..0bdfe2b9cf601
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_obj_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_obj_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_obj_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_obj_r.ilproj
new file mode 100644
index 0000000000000..71bac2cd7dc70
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_obj_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il
index 4e0e4e90ef6ae..1561302794e53 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib { }
-.assembly compat_r4_r8 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_r4_r8
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_d.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_d.il
new file mode 100644
index 0000000000000..c4fd315b39fcd
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r4_r8_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_d.ilproj
new file mode 100644
index 0000000000000..3bce40302f633
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj
deleted file mode 100644
index 33fb14329ec39..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj
deleted file mode 100644
index 327debd747d16..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il
index 61641f9bc576c..b8f9f705ee543 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib { }
-.assembly compat_r4_r8_inl { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_r4_r8_inl
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_d.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_d.il
new file mode 100644
index 0000000000000..d0387fdd42792
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r4_r8_inl_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_d.ilproj
new file mode 100644
index 0000000000000..7bbb02ba4aa0f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj
deleted file mode 100644
index 107544d037e96..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj
deleted file mode 100644
index bd43a331fc00f..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_r.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_r.il
new file mode 100644
index 0000000000000..8e281c12a0864
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r4_r8_inl_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_r.ilproj
new file mode 100644
index 0000000000000..52db8b601216d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_inl_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_r.il b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_r.il
new file mode 100644
index 0000000000000..9c8490598187f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r4_r8_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r4_r8_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_r.ilproj
new file mode 100644
index 0000000000000..ceca0f979bb4b
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r4_r8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il
index ed1f430659305..2670b0cb5764b 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib { }
-.assembly compat_r8_r4 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_r8_r4
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_d.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_d.il
new file mode 100644
index 0000000000000..1321abf48f11e
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r8_r4_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_d.ilproj
new file mode 100644
index 0000000000000..c7008851f3a0a
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj
deleted file mode 100644
index b46efc54b3254..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj
deleted file mode 100644
index 2893df0c838f3..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il
index 736308b10cbf5..e665f3d9db6f9 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib { }
-.assembly compat_r8_r4_inl { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_r8_r4_inl
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_d.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_d.il
new file mode 100644
index 0000000000000..8fc38a1a657af
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r8_r4_inl_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_d.ilproj
new file mode 100644
index 0000000000000..2e25d23db7df4
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj
deleted file mode 100644
index 80896998a3835..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj
deleted file mode 100644
index 5061a25234379..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_r.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_r.il
new file mode 100644
index 0000000000000..4dc7bed4f2feb
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r8_r4_inl_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_r.ilproj
new file mode 100644
index 0000000000000..2be8d593a8605
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_inl_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_r.il b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_r.il
new file mode 100644
index 0000000000000..f3747c8a4189f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_r8_r4_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_r8_r4_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_r.ilproj
new file mode 100644
index 0000000000000..a00ef27521f2c
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_r8_r4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v.il b/src/tests/JIT/Methodical/tailcall/compat_v.il
index ec8198a4e2fd8..042b9bf060370 100644
--- a/src/tests/JIT/Methodical/tailcall/compat_v.il
+++ b/src/tests/JIT/Methodical/tailcall/compat_v.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly compat_v { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_v
{
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_d.il b/src/tests/JIT/Methodical/tailcall/compat_v_d.il
new file mode 100644
index 0000000000000..44dfe44ce3171
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_v_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_v_d"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_v_d.ilproj
new file mode 100644
index 0000000000000..e749f113d7ee8
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_v_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj
deleted file mode 100644
index ec934c5634553..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_v_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj
deleted file mode 100644
index 7b5aacb99aae2..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/compat_v_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_r.il b/src/tests/JIT/Methodical/tailcall/compat_v_r.il
new file mode 100644
index 0000000000000..5fe53e17ebc11
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_v_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "compat_v_r"
diff --git a/src/tests/JIT/Methodical/tailcall/compat_v_r.ilproj b/src/tests/JIT/Methodical/tailcall/compat_v_r.ilproj
new file mode 100644
index 0000000000000..a106367151043
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/compat_v_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array.il b/src/tests/JIT/Methodical/tailcall/deep_array.il
index 22648b7ec4df8..0de852915adb6 100644
--- a/src/tests/JIT/Methodical/tailcall/deep_array.il
+++ b/src/tests/JIT/Methodical/tailcall/deep_array.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deep_array { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_deep_array
{
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_d.il b/src/tests/JIT/Methodical/tailcall/deep_array_d.il
new file mode 100644
index 0000000000000..5bc2e337c032d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_array_d"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_d.ilproj
new file mode 100644
index 0000000000000..f2c84c92e117f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj
deleted file mode 100644
index bf8738c9b9ffc..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_array_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj
deleted file mode 100644
index 13072ae493288..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_array_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz.il b/src/tests/JIT/Methodical/tailcall/deep_array_nz.il
index 6fa4dd15e4cb1..89b7a8803d98c 100644
--- a/src/tests/JIT/Methodical/tailcall/deep_array_nz.il
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deep_array_nz { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_deep_array_nz
{
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_d.il b/src/tests/JIT/Methodical/tailcall/deep_array_nz_d.il
new file mode 100644
index 0000000000000..da987e5e0b9b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_array_nz_d"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_nz_d.ilproj
new file mode 100644
index 0000000000000..e08785f7e55ff
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj
deleted file mode 100644
index f9e6cde33097f..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj
deleted file mode 100644
index 7257ef5862bef..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_array_nz_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_r.il b/src/tests/JIT/Methodical/tailcall/deep_array_nz_r.il
new file mode 100644
index 0000000000000..1502a4dab4a38
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_array_nz_r"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_nz_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_nz_r.ilproj
new file mode 100644
index 0000000000000..dbc44652a8c19
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_nz_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_r.il b/src/tests/JIT/Methodical/tailcall/deep_array_r.il
new file mode 100644
index 0000000000000..7bc5918edb664
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_array_r"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_array_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_array_r.ilproj
new file mode 100644
index 0000000000000..b483ca6956f7d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_array_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc.il b/src/tests/JIT/Methodical/tailcall/deep_gc.il
index 87aa7e61ef794..50341c3ebb980 100644
--- a/src/tests/JIT/Methodical/tailcall/deep_gc.il
+++ b/src/tests/JIT/Methodical/tailcall/deep_gc.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deep_gc { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_deep_gc
{
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_d.il b/src/tests/JIT/Methodical/tailcall/deep_gc_d.il
new file mode 100644
index 0000000000000..8165da1a63ef6
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_gc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_gc_d"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_gc_d.ilproj
new file mode 100644
index 0000000000000..941d318098d8c
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_gc_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj
deleted file mode 100644
index 1cf12034f0423..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_gc_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj
deleted file mode 100644
index eb64df0c91575..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_gc_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_r.il b/src/tests/JIT/Methodical/tailcall/deep_gc_r.il
new file mode 100644
index 0000000000000..7c4f9fdba3790
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_gc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_gc_r"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_gc_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_gc_r.ilproj
new file mode 100644
index 0000000000000..9702fbfb28863
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_gc_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst.il b/src/tests/JIT/Methodical/tailcall/deep_inst.il
index 8140171779e1b..20b64b3caec9e 100644
--- a/src/tests/JIT/Methodical/tailcall/deep_inst.il
+++ b/src/tests/JIT/Methodical/tailcall/deep_inst.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deep_inst { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_deep_inst
{
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_d.il b/src/tests/JIT/Methodical/tailcall/deep_inst_d.il
new file mode 100644
index 0000000000000..75a661ebb47c9
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_inst_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_inst_d"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_inst_d.ilproj
new file mode 100644
index 0000000000000..8631c41e8597f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_inst_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj
deleted file mode 100644
index c173c2814bd4c..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_inst_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj
deleted file mode 100644
index b9622ea78ea63..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_inst_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_r.il b/src/tests/JIT/Methodical/tailcall/deep_inst_r.il
new file mode 100644
index 0000000000000..68a88e82e3945
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_inst_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_inst_r"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_inst_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_inst_r.ilproj
new file mode 100644
index 0000000000000..f7f8d62cbdceb
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_inst_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value.il b/src/tests/JIT/Methodical/tailcall/deep_value.il
index f5111d5c0e91e..fd852473eef16 100644
--- a/src/tests/JIT/Methodical/tailcall/deep_value.il
+++ b/src/tests/JIT/Methodical/tailcall/deep_value.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deep_value { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_deep_value
{
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_d.il b/src/tests/JIT/Methodical/tailcall/deep_value_d.il
new file mode 100644
index 0000000000000..eea05331afe97
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_value_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_value_d"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_value_d.ilproj
new file mode 100644
index 0000000000000..71116295f5c63
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_value_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj
deleted file mode 100644
index 764d480ba1051..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_value_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj
deleted file mode 100644
index efdfc21c23cac..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_value_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_r.il b/src/tests/JIT/Methodical/tailcall/deep_value_r.il
new file mode 100644
index 0000000000000..af49fcd5bb9c8
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_value_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_value_r"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_value_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_value_r.ilproj
new file mode 100644
index 0000000000000..0e01471749837
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_value_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt.il b/src/tests/JIT/Methodical/tailcall/deep_virt.il
index d6bde6b497b1f..970dc3175c625 100644
--- a/src/tests/JIT/Methodical/tailcall/deep_virt.il
+++ b/src/tests/JIT/Methodical/tailcall/deep_virt.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly deep_virt { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_deep_virt
{
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_d.il b/src/tests/JIT/Methodical/tailcall/deep_virt_d.il
new file mode 100644
index 0000000000000..f388e3f2fc2b5
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_virt_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_virt_d"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_virt_d.ilproj
new file mode 100644
index 0000000000000..03df89ee7203d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_virt_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj
deleted file mode 100644
index b040b4ae38d70..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_virt_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj
deleted file mode 100644
index 3a38a1c5ba121..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/deep_virt_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_r.il b/src/tests/JIT/Methodical/tailcall/deep_virt_r.il
new file mode 100644
index 0000000000000..ad11e5e8c89d0
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_virt_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "deep_virt_r"
diff --git a/src/tests/JIT/Methodical/tailcall/deep_virt_r.ilproj b/src/tests/JIT/Methodical/tailcall/deep_virt_r.ilproj
new file mode 100644
index 0000000000000..f33bed6bf6a0e
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/deep_virt_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/gcval.il b/src/tests/JIT/Methodical/tailcall/gcval.il
index 93eee89b55b4f..a1bf48a78499f 100644
--- a/src/tests/JIT/Methodical/tailcall/gcval.il
+++ b/src/tests/JIT/Methodical/tailcall/gcval.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly gcval { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_gcval
{
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_d.il b/src/tests/JIT/Methodical/tailcall/gcval_d.il
new file mode 100644
index 0000000000000..bb5d68dd63ad3
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcval_d"
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_d.ilproj
new file mode 100644
index 0000000000000..543bb24a3eefa
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj
deleted file mode 100644
index c9d9c1769314c..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/gcval_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj
deleted file mode 100644
index bd1ded421c35f..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/gcval_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested.il b/src/tests/JIT/Methodical/tailcall/gcval_nested.il
index 85def71fb69a4..6f5dde43268b4 100644
--- a/src/tests/JIT/Methodical/tailcall/gcval_nested.il
+++ b/src/tests/JIT/Methodical/tailcall/gcval_nested.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'gcval_nested' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_gcval_nested
{
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_d.il b/src/tests/JIT/Methodical/tailcall/gcval_nested_d.il
new file mode 100644
index 0000000000000..1cb900b4f3284
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_nested_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcval_nested_d"
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_nested_d.ilproj
new file mode 100644
index 0000000000000..883dca5d863df
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_nested_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj
deleted file mode 100644
index 9d6938303d546..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj
deleted file mode 100644
index b0bf097f91993..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/gcval_nested_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_r.il b/src/tests/JIT/Methodical/tailcall/gcval_nested_r.il
new file mode 100644
index 0000000000000..dc15b6583acc8
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_nested_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcval_nested_r"
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_nested_r.ilproj
new file mode 100644
index 0000000000000..3311b2f2a99ea
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_nested_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_r.il b/src/tests/JIT/Methodical/tailcall/gcval_r.il
new file mode 100644
index 0000000000000..e6c02680d8762
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcval_r"
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_r.ilproj
new file mode 100644
index 0000000000000..851d1553d472d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il
index f6da98a701626..2b6f666158c9a 100644
--- a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il
+++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly gcval_sideeffect { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_compat_gcval_sideeffect
{
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_d.il b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_d.il
new file mode 100644
index 0000000000000..dc98f16b5a16f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcval_sideeffect_d"
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_d.ilproj
new file mode 100644
index 0000000000000..6ebe8e7be6685
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj
deleted file mode 100644
index be7af0a686ff5..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj
deleted file mode 100644
index 8f523cd702745..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_r.il b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_r.il
new file mode 100644
index 0000000000000..663b72ccc1fd7
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "gcval_sideeffect_r"
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_r.ilproj b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_r.ilproj
new file mode 100644
index 0000000000000..e33871ecde72c
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/gcval_sideeffect_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/pointer.il b/src/tests/JIT/Methodical/tailcall/pointer.il
index 96a4debe89011..e32aed10a2cea 100644
--- a/src/tests/JIT/Methodical/tailcall/pointer.il
+++ b/src/tests/JIT/Methodical/tailcall/pointer.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
.assembly extern xunit.core {}
-.assembly pointer { }
+.assembly ASSEMBLY_NAME { }
.field public static int32 temp at D_00004000
.method public static class System.String
rems(int32* n,
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_d.il b/src/tests/JIT/Methodical/tailcall/pointer_d.il
new file mode 100644
index 0000000000000..e279a682d70a9
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "pointer_d"
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_d.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_d.ilproj
new file mode 100644
index 0000000000000..9e8c8371d541a
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i.il b/src/tests/JIT/Methodical/tailcall/pointer_i.il
index e34af54d1e28d..7938b5ff91e38 100644
--- a/src/tests/JIT/Methodical/tailcall/pointer_i.il
+++ b/src/tests/JIT/Methodical/tailcall/pointer_i.il
@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
.assembly extern xunit.core {}
-.assembly pointer_i { }
+.assembly ASSEMBLY_NAME { }
.field public static int32 temp at D_00004000
.method public static class System.String
rems(int32* n,
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_d.il b/src/tests/JIT/Methodical/tailcall/pointer_i_d.il
new file mode 100644
index 0000000000000..15014c7af1323
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_i_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "pointer_i_d"
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_d.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_i_d.ilproj
new file mode 100644
index 0000000000000..1bbebca4f13a9
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_i_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj
deleted file mode 100644
index 961f20c2ef8d6..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/pointer_i_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj
deleted file mode 100644
index 409bf4b2c1ea5..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/pointer_i_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_r.il b/src/tests/JIT/Methodical/tailcall/pointer_i_r.il
new file mode 100644
index 0000000000000..b9e5d538dc073
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_i_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "pointer_i_r"
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_i_r.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_i_r.ilproj
new file mode 100644
index 0000000000000..a8e55e91c47ee
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_i_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj
deleted file mode 100644
index 70d15e7ecb282..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/pointer_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj
deleted file mode 100644
index dc63676b04c33..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/pointer_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_r.il b/src/tests/JIT/Methodical/tailcall/pointer_r.il
new file mode 100644
index 0000000000000..5d9944fa680b6
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "pointer_r"
diff --git a/src/tests/JIT/Methodical/tailcall/pointer_r.ilproj b/src/tests/JIT/Methodical/tailcall/pointer_r.ilproj
new file mode 100644
index 0000000000000..ae9e48adf48ad
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/pointer_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep.il b/src/tests/JIT/Methodical/tailcall/recurse_ep.il
index 1a1e4dba058ca..b16f1df648f3d 100644
--- a/src/tests/JIT/Methodical/tailcall/recurse_ep.il
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly recurse_ep { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_recurse_ep
{
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_d.il b/src/tests/JIT/Methodical/tailcall/recurse_ep_d.il
new file mode 100644
index 0000000000000..901e15610ca3a
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_ep_d"
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_d.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_d.ilproj
new file mode 100644
index 0000000000000..2c5f73527bba0
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj
deleted file mode 100644
index 234d1d38ee7e6..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj
deleted file mode 100644
index 96baeaeb8e148..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/recurse_ep_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_r.il b/src/tests/JIT/Methodical/tailcall/recurse_ep_r.il
new file mode 100644
index 0000000000000..bf655aa5d46c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_ep_r"
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_r.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_r.ilproj
new file mode 100644
index 0000000000000..cffaf967f8f91
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il b/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il
index a05f6e5800cad..ab22206060430 100644
--- a/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly recurse_ep_void { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_recurse_ep_void
{
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_d.il b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_d.il
new file mode 100644
index 0000000000000..25b3d56540cad
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_ep_void_d"
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_d.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_d.ilproj
new file mode 100644
index 0000000000000..7748d3ed28c85
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj
deleted file mode 100644
index 90105e8aebaa9..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj
deleted file mode 100644
index ef36852b3dbe1..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_r.il b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_r.il
new file mode 100644
index 0000000000000..f20dee9aeaa51
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "recurse_ep_void_r"
diff --git a/src/tests/JIT/Methodical/tailcall/recurse_ep_void_r.ilproj b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_r.ilproj
new file mode 100644
index 0000000000000..c9a19314ef67f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/recurse_ep_void_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i.il b/src/tests/JIT/Methodical/tailcall/reference_i.il
index b6124288a2311..925336437c10f 100644
--- a/src/tests/JIT/Methodical/tailcall/reference_i.il
+++ b/src/tests/JIT/Methodical/tailcall/reference_i.il
@@ -8,7 +8,7 @@
.ver 4:0:0:0
}
.assembly extern xunit.core {}
-.assembly reference_i { }
+.assembly ASSEMBLY_NAME { }
.method public static class System.String
rems(int32& n,
int32& m) il managed
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_d.il b/src/tests/JIT/Methodical/tailcall/reference_i_d.il
new file mode 100644
index 0000000000000..6b8cacb288f2e
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/reference_i_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "reference_i_d"
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_d.ilproj b/src/tests/JIT/Methodical/tailcall/reference_i_d.ilproj
new file mode 100644
index 0000000000000..222b9df2a4a39
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/reference_i_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj
deleted file mode 100644
index 75419284daf6e..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/reference_i_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj
deleted file mode 100644
index 0bc661b8416bf..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/reference_i_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_r.il b/src/tests/JIT/Methodical/tailcall/reference_i_r.il
new file mode 100644
index 0000000000000..2e599cfa4d981
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/reference_i_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "reference_i_r"
diff --git a/src/tests/JIT/Methodical/tailcall/reference_i_r.ilproj b/src/tests/JIT/Methodical/tailcall/reference_i_r.ilproj
new file mode 100644
index 0000000000000..56d844abacf2c
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/reference_i_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a.il b/src/tests/JIT/Methodical/tailcall/test_2a.il
index c145d11d21ba8..3363e6c02cdce 100644
--- a/src/tests/JIT/Methodical/tailcall/test_2a.il
+++ b/src/tests/JIT/Methodical/tailcall/test_2a.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly test_2a { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_2a
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_d.il b/src/tests/JIT/Methodical/tailcall/test_2a_d.il
new file mode 100644
index 0000000000000..f71a504e3bc03
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2a_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_2a_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2a_d.ilproj
new file mode 100644
index 0000000000000..3af9e2042aef8
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2a_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj
deleted file mode 100644
index a9ff90843ac7b..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_2a_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj
deleted file mode 100644
index eb7b6234dd6e7..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_2a_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_r.il b/src/tests/JIT/Methodical/tailcall/test_2a_r.il
new file mode 100644
index 0000000000000..0c70472689651
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2a_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_2a_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_2a_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2a_r.ilproj
new file mode 100644
index 0000000000000..6bf9d652e2617
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2a_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b.il b/src/tests/JIT/Methodical/tailcall/test_2b.il
index 86e04824a301c..7fd93dbe41943 100644
--- a/src/tests/JIT/Methodical/tailcall/test_2b.il
+++ b/src/tests/JIT/Methodical/tailcall/test_2b.il
@@ -7,7 +7,7 @@
.assembly extern mscorlib { auto }
.assembly extern System.Console { auto }
-.assembly test_2b { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_2b
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_d.il b/src/tests/JIT/Methodical/tailcall/test_2b_d.il
new file mode 100644
index 0000000000000..ee1729b2ff71a
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_2b_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2b_d.ilproj
new file mode 100644
index 0000000000000..799b9587d2808
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2b_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj
deleted file mode 100644
index a5b55ca6a19e0..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_2b_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj
deleted file mode 100644
index ebd91458e7f6d..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_2b_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_r.il b/src/tests/JIT/Methodical/tailcall/test_2b_r.il
new file mode 100644
index 0000000000000..0c6f8d1447a6d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_2b_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_2b_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2b_r.ilproj
new file mode 100644
index 0000000000000..02e5293069456
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2b_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c.il b/src/tests/JIT/Methodical/tailcall/test_2c.il
index 0c0169b77d30e..7737efc09626f 100644
--- a/src/tests/JIT/Methodical/tailcall/test_2c.il
+++ b/src/tests/JIT/Methodical/tailcall/test_2c.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly test_2c { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_2c
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_d.il b/src/tests/JIT/Methodical/tailcall/test_2c_d.il
new file mode 100644
index 0000000000000..28059481db80d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2c_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_2c_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2c_d.ilproj
new file mode 100644
index 0000000000000..8878a64c7280a
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2c_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj
deleted file mode 100644
index d33775f857991..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_2c_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj
deleted file mode 100644
index baa20c9f4163e..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_2c_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_r.il b/src/tests/JIT/Methodical/tailcall/test_2c_r.il
new file mode 100644
index 0000000000000..7f5278abbcb8f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2c_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_2c_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_2c_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_2c_r.ilproj
new file mode 100644
index 0000000000000..de9abba7e755d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_2c_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b.il b/src/tests/JIT/Methodical/tailcall/test_3b.il
index ce6dee1df7ec3..65150dda863fc 100644
--- a/src/tests/JIT/Methodical/tailcall/test_3b.il
+++ b/src/tests/JIT/Methodical/tailcall/test_3b.il
@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly test_3b { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_3b
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_d.il b/src/tests/JIT/Methodical/tailcall/test_3b_d.il
new file mode 100644
index 0000000000000..7f4874ca382af
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_3b_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_3b_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_3b_d.ilproj
new file mode 100644
index 0000000000000..5ca82793959b6
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_3b_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj
deleted file mode 100644
index 0038bbfc27beb..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_3b_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj
deleted file mode 100644
index db5c63806baea..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_3b_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_r.il b/src/tests/JIT/Methodical/tailcall/test_3b_r.il
new file mode 100644
index 0000000000000..d77dfd6a3db9f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_3b_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_3b_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_3b_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_3b_r.ilproj
new file mode 100644
index 0000000000000..1974b4a6da491
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_3b_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit.il b/src/tests/JIT/Methodical/tailcall/test_implicit.il
index 54b60e7999802..11ed3e1eb7020 100644
--- a/src/tests/JIT/Methodical/tailcall/test_implicit.il
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly 'test_implicit'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_d.il b/src/tests/JIT/Methodical/tailcall/test_implicit_d.il
new file mode 100644
index 0000000000000..18e1a0f9a37ec
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_implicit_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_implicit_d.ilproj
new file mode 100644
index 0000000000000..efe9b29b86c90
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj
deleted file mode 100644
index 44d30fdc75581..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_implicit_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj
deleted file mode 100644
index caa938e9d0e93..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_implicit_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_r.il b/src/tests/JIT/Methodical/tailcall/test_implicit_r.il
new file mode 100644
index 0000000000000..81cd539f977a1
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_implicit_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_implicit_r.ilproj
new file mode 100644
index 0000000000000..e5c9a7d820401
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il b/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il
index 65b5cfb8bf200..c808f8339d4b6 100644
--- a/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il
+++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly test_mutual_rec { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_mutual_rec
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_d.il b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_d.il
new file mode 100644
index 0000000000000..adfec60c4aef3
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_mutual_rec_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_d.ilproj
new file mode 100644
index 0000000000000..11ce166ed5826
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj
deleted file mode 100644
index df6335ef2bfcd..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj
deleted file mode 100644
index d5f22faf5bdda..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_r.il b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_r.il
new file mode 100644
index 0000000000000..f93a14287f438
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_mutual_rec_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_mutual_rec_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_r.ilproj
new file mode 100644
index 0000000000000..7e49a937141c9
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_mutual_rec_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch.il b/src/tests/JIT/Methodical/tailcall/test_switch.il
index 78e1fdbc10d99..f1aa72792cc03 100644
--- a/src/tests/JIT/Methodical/tailcall/test_switch.il
+++ b/src/tests/JIT/Methodical/tailcall/test_switch.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly test_switch { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_switch
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_d.il b/src/tests/JIT/Methodical/tailcall/test_switch_d.il
new file mode 100644
index 0000000000000..2817fd1585130
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_switch_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_switch_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_switch_d.ilproj
new file mode 100644
index 0000000000000..49f5e6c960d49
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_switch_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj
deleted file mode 100644
index ba2c5a2e21934..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_switch_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj
deleted file mode 100644
index 9432aec2cec28..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_switch_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_r.il b/src/tests/JIT/Methodical/tailcall/test_switch_r.il
new file mode 100644
index 0000000000000..659b0379a8ef1
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_switch_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_switch_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_switch_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_switch_r.ilproj
new file mode 100644
index 0000000000000..b0116da1a3ffc
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_switch_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt.il b/src/tests/JIT/Methodical/tailcall/test_virt.il
index c06597d283617..d7179b1a72a1e 100644
--- a/src/tests/JIT/Methodical/tailcall/test_virt.il
+++ b/src/tests/JIT/Methodical/tailcall/test_virt.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly test_virt { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_virt
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_d.il b/src/tests/JIT/Methodical/tailcall/test_virt_d.il
new file mode 100644
index 0000000000000..d2196e4461133
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_virt_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_virt_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_virt_d.ilproj
new file mode 100644
index 0000000000000..2a6c32b9ffe6d
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_virt_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj
deleted file mode 100644
index e86439fcf7034..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_virt_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj
deleted file mode 100644
index 57e9e93e8fcb3..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_virt_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_r.il b/src/tests/JIT/Methodical/tailcall/test_virt_r.il
new file mode 100644
index 0000000000000..faae66b5a6b0e
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_virt_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_virt_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_virt_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_virt_r.ilproj
new file mode 100644
index 0000000000000..c95881ae284ba
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_virt_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_void.il b/src/tests/JIT/Methodical/tailcall/test_void.il
index ccb19cadd62f3..38ebca99ae411 100644
--- a/src/tests/JIT/Methodical/tailcall/test_void.il
+++ b/src/tests/JIT/Methodical/tailcall/test_void.il
@@ -6,7 +6,7 @@
.assembly extern System.Runtime.Extensions { auto }
.assembly extern mscorlib { auto }
-.assembly test_void { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_test_void
{
diff --git a/src/tests/JIT/Methodical/tailcall/test_void_d.il b/src/tests/JIT/Methodical/tailcall/test_void_d.il
new file mode 100644
index 0000000000000..c705bf314ac3f
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_void_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_void_d"
diff --git a/src/tests/JIT/Methodical/tailcall/test_void_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_void_d.ilproj
new file mode 100644
index 0000000000000..f2d51790f8d45
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_void_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj b/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj
deleted file mode 100644
index 82c54d2792983..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_void_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj
deleted file mode 100644
index 0f1e5af140bb1..0000000000000
--- a/src/tests/JIT/Methodical/tailcall/test_void_il_r.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/tailcall/test_void_r.il b/src/tests/JIT/Methodical/tailcall/test_void_r.il
new file mode 100644
index 0000000000000..dc8c85ac4d85b
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_void_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "test_void_r"
diff --git a/src/tests/JIT/Methodical/tailcall/test_void_r.ilproj b/src/tests/JIT/Methodical/tailcall/test_void_r.ilproj
new file mode 100644
index 0000000000000..82056b8bb92b1
--- /dev/null
+++ b/src/tests/JIT/Methodical/tailcall/test_void_r.ilproj
@@ -0,0 +1,9 @@
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3.il b/src/tests/JIT/Methodical/xxblk/cpblk3.il
index caa62abeb0e12..5e3540b31b483 100644
--- a/src/tests/JIT/Methodical/xxblk/cpblk3.il
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3.il
@@ -12,7 +12,7 @@
}
.namespace Test_cpblk3
{
-.assembly 'cpblk3' {}
+.assembly ASSEMBLY_NAME {}
.class public explicit ansi sealed $MultiByte$size$34
extends [mscorlib]System.ValueType
{
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_d.il b/src/tests/JIT/Methodical/xxblk/cpblk3_d.il
new file mode 100644
index 0000000000000..f89e762010f48
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cpblk3_d"
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_d.ilproj b/src/tests/JIT/Methodical/xxblk/cpblk3_d.ilproj
new file mode 100644
index 0000000000000..a5d48c049f0fe
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
deleted file mode 100644
index 2fac298af4db2..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
deleted file mode 100644
index 1ffb0cc581de4..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_r.il b/src/tests/JIT/Methodical/xxblk/cpblk3_r.il
new file mode 100644
index 0000000000000..9ce5fba98e54d
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "cpblk3_r"
diff --git a/src/tests/JIT/Methodical/xxblk/cpblk3_r.ilproj b/src/tests/JIT/Methodical/xxblk/cpblk3_r.ilproj
new file mode 100644
index 0000000000000..ead68a108d9a5
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/cpblk3_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk.il b/src/tests/JIT/Methodical/xxblk/dynblk.il
index 40ab179a18157..67ddb41a555d2 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk.il
+++ b/src/tests/JIT/Methodical/xxblk/dynblk.il
@@ -11,7 +11,7 @@
.ver 4:0:0:0
}
-.assembly dynblk {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.namespace Test_dynblk_il
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_d.il b/src/tests/JIT/Methodical/xxblk/dynblk_d.il
new file mode 100644
index 0000000000000..b0e685d6cd98a
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "dynblk_d"
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_d.ilproj
new file mode 100644
index 0000000000000..6f1e981036aa5
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj
deleted file mode 100644
index 3ddb6cc303b43..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/dynblk_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj
deleted file mode 100644
index c309f750b92b9..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/dynblk_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order.il b/src/tests/JIT/Methodical/xxblk/dynblk_order.il
index 7355ba4e54b50..8a47b5a6b4fd9 100644
--- a/src/tests/JIT/Methodical/xxblk/dynblk_order.il
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order.il
@@ -7,7 +7,7 @@
.assembly extern System.Console { }
.assembly extern xunit.core {}
-.assembly 'dynblk_order' {}
+.assembly ASSEMBLY_NAME {}
.typedef [System.Runtime]System.OverflowException as OverflowException
.typedef [System.Runtime]System.IndexOutOfRangeException as IndexOutOfRangeException
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_d.il b/src/tests/JIT/Methodical/xxblk/dynblk_order_d.il
new file mode 100644
index 0000000000000..cc977c0c77f60
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "dynblk_order_d"
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_d.ilproj
new file mode 100644
index 0000000000000..08132127b62ab
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj
deleted file mode 100644
index a8225057d8499..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj
deleted file mode 100644
index 036aa3a374883..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/dynblk_order_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_r.il b/src/tests/JIT/Methodical/xxblk/dynblk_order_r.il
new file mode 100644
index 0000000000000..e95aae3a20bd4
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "dynblk_order_r"
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_order_r.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_order_r.ilproj
new file mode 100644
index 0000000000000..47a568973946b
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_order_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_r.il b/src/tests/JIT/Methodical/xxblk/dynblk_r.il
new file mode 100644
index 0000000000000..e7c1ea7f9f608
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "dynblk_r"
diff --git a/src/tests/JIT/Methodical/xxblk/dynblk_r.ilproj b/src/tests/JIT/Methodical/xxblk/dynblk_r.ilproj
new file mode 100644
index 0000000000000..27415d9ffe7e0
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/dynblk_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3.il b/src/tests/JIT/Methodical/xxblk/initblk3.il
index 3063b1531f4f5..cd3f9dc55cb36 100644
--- a/src/tests/JIT/Methodical/xxblk/initblk3.il
+++ b/src/tests/JIT/Methodical/xxblk/initblk3.il
@@ -10,7 +10,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'initblk3' {}
+.assembly ASSEMBLY_NAME {}
.namespace Test_initblk3
{
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_d.il b/src/tests/JIT/Methodical/xxblk/initblk3_d.il
new file mode 100644
index 0000000000000..3f06842fd5ba2
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/initblk3_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "initblk3_d"
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_d.ilproj b/src/tests/JIT/Methodical/xxblk/initblk3_d.ilproj
new file mode 100644
index 0000000000000..3ea5ad94f28b4
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/initblk3_d.ilproj
@@ -0,0 +1,11 @@
+
+
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj b/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj
deleted file mode 100644
index 7224725c83fd1..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/initblk3_il_d.ilproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj b/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj
deleted file mode 100644
index 94517390f1bb1..0000000000000
--- a/src/tests/JIT/Methodical/xxblk/initblk3_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- PdbOnly
- False
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_r.il b/src/tests/JIT/Methodical/xxblk/initblk3_r.il
new file mode 100644
index 0000000000000..eeceace3ec1bf
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/initblk3_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "initblk3_r"
diff --git a/src/tests/JIT/Methodical/xxblk/initblk3_r.ilproj b/src/tests/JIT/Methodical/xxblk/initblk3_r.ilproj
new file mode 100644
index 0000000000000..0acb37e8799d0
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxblk/initblk3_r.ilproj
@@ -0,0 +1,12 @@
+
+
+
+
+ PdbOnly
+ False
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il
index b2959b932788e..4932128f2be56 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldobj_I { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldobj_I_ldobj_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il
index bea55ae5b142b..1f2f6b616590f 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldobj_I8 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldobj_I8_ldobj_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_d.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_d.il
new file mode 100644
index 0000000000000..569b3e1e57e93
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_I8_d"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_d.ilproj
new file mode 100644
index 0000000000000..7d630dbde9d1a
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj
deleted file mode 100644
index 0caeb6481f33a..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj
deleted file mode 100644
index 73185c9e21d94..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_r.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_r.il
new file mode 100644
index 0000000000000..5e29a1a0a0a22
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_I8_r"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_r.ilproj
new file mode 100644
index 0000000000000..104ba3bdbbc9e
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_d.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_d.il
new file mode 100644
index 0000000000000..ad8959397d97f
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_I_d"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_d.ilproj
new file mode 100644
index 0000000000000..b4a62ee156867
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj
deleted file mode 100644
index 7fa2e3ccd3855..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj
deleted file mode 100644
index 25a96803b8591..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_r.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_r.il
new file mode 100644
index 0000000000000..1fa9b9b07357b
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_I_r"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_r.ilproj
new file mode 100644
index 0000000000000..99208536f4158
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_I_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il
index 0c3524af22252..b0c1960886f55 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldobj_R4 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldobj_R4_ldobj_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_d.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_d.il
new file mode 100644
index 0000000000000..826f1712af332
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_R4_d"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_d.ilproj
new file mode 100644
index 0000000000000..5cfd30b4e7cc8
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj
deleted file mode 100644
index 9e88e90cbe4c5..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj
deleted file mode 100644
index d81a62bfb5e8b..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_r.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_r.il
new file mode 100644
index 0000000000000..182e6598f066c
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_R4_r"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_r.ilproj
new file mode 100644
index 0000000000000..7906295133dc9
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R4_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il
index 724f11553fa6b..2e4a89398ed5b 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldobj_R8 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldobj_R8_ldobj_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_d.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_d.il
new file mode 100644
index 0000000000000..b538a51a96772
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_R8_d"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_d.ilproj
new file mode 100644
index 0000000000000..8082b77151eb3
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj
deleted file mode 100644
index 4a5581962d95d..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj
deleted file mode 100644
index c3a7be1fb45ed..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_r.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_r.il
new file mode 100644
index 0000000000000..ab931d9f29fa0
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_R8_r"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_r.ilproj
new file mode 100644
index 0000000000000..f2664effd3f6a
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_R8_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il
index 5f7e554636531..5992f80087e3e 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldobj_U2 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldobj_U2_ldobj_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_d.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_d.il
new file mode 100644
index 0000000000000..0a7b9a7bd6aed
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_U2_d"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_d.ilproj
new file mode 100644
index 0000000000000..a2c5e79383446
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj
deleted file mode 100644
index 83d4bf4d25c87..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj
deleted file mode 100644
index a29648900895f..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_r.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_r.il
new file mode 100644
index 0000000000000..c5f91b92f3438
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_U2_r"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_r.ilproj
new file mode 100644
index 0000000000000..829381565e673
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_U2_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il
index 8d96872019e68..959a5058f13eb 100644
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly ldobj_V { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldobj_V_ldobj_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_d.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_d.il
new file mode 100644
index 0000000000000..d085635a163b0
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_V_d"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_d.ilproj
new file mode 100644
index 0000000000000..769db34bd8880
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj
deleted file mode 100644
index 0e284de73631b..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj
deleted file mode 100644
index 3dd3a4ffe301d..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_r.il b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_r.il
new file mode 100644
index 0000000000000..2a09f7ba50436
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldobj_V_r"
diff --git a/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_r.ilproj b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_r.ilproj
new file mode 100644
index 0000000000000..7216d2de4fbc2
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/ldobj/ldobj_V_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const.il b/src/tests/JIT/Methodical/xxobj/operand/const.il
index 29a806e8fcc72..6597bf462c68e 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/const.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/const.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'const'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_d.il b/src/tests/JIT/Methodical/xxobj/operand/const_d.il
new file mode 100644
index 0000000000000..dfca1e45ea282
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/const_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "const_d"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/const_d.ilproj
new file mode 100644
index 0000000000000..fb035a2267585
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/const_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj
deleted file mode 100644
index 423bb95d4fdb2..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/const_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj
deleted file mode 100644
index 9e75fdfaa008c..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/const_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_r.il b/src/tests/JIT/Methodical/xxobj/operand/const_r.il
new file mode 100644
index 0000000000000..da4aaaa78a994
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/const_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "const_r"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/const_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/const_r.ilproj
new file mode 100644
index 0000000000000..7ac92dbb741e9
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/const_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema.il b/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
index 3cc8a4364bf30..af74736bcd7a5 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldelema' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_ldelema_operand_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_d.il b/src/tests/JIT/Methodical/xxobj/operand/ldelema_d.il
new file mode 100644
index 0000000000000..7c96ea9cda1c5
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldelema_d"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/ldelema_d.ilproj
new file mode 100644
index 0000000000000..9fc30980eb3c3
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj
deleted file mode 100644
index 0dae92823e88e..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj
deleted file mode 100644
index b153ba435235a..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_r.il b/src/tests/JIT/Methodical/xxobj/operand/ldelema_r.il
new file mode 100644
index 0000000000000..771c58f216858
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldelema_r"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/ldelema_r.ilproj
new file mode 100644
index 0000000000000..43da3512856f3
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc.il b/src/tests/JIT/Methodical/xxobj/operand/localloc.il
index 8273e29968477..e6fbfe05d2b50 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/localloc.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
.assembly extern mscorlib { }
-.assembly 'localloc_operand' {
+.assembly ASSEMBLY_NAME {
}
.assembly extern xunit.core {}
.namespace JitTest_localloc_operand_il
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_d.il b/src/tests/JIT/Methodical/xxobj/operand/localloc_d.il
new file mode 100644
index 0000000000000..20e41c5ebbdb8
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "localloc_operand_d"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_d.ilproj
new file mode 100644
index 0000000000000..5ad25e3bbc237
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_d.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj
deleted file mode 100644
index 0c61e9426fce3..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_d.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj
deleted file mode 100644
index 63013e0fe9a7d..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_il_r.ilproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- 1
-
- true
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_r.ilproj
new file mode 100644
index 0000000000000..9826de88a3a43
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc_operand_r.ilproj
@@ -0,0 +1,14 @@
+
+
+ 1
+
+ true
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/localloc_r.il b/src/tests/JIT/Methodical/xxobj/operand/localloc_r.il
new file mode 100644
index 0000000000000..40f7b37d43ce5
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/localloc_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "localloc_operand_r"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray.il b/src/tests/JIT/Methodical/xxobj/operand/mdarray.il
index ce49f174af7a6..129cf69190b6a 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/mdarray.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly mdarray { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.namespace JitTest_mdarray_operand_il
{
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_d.il b/src/tests/JIT/Methodical/xxobj/operand/mdarray_d.il
new file mode 100644
index 0000000000000..e9d59f61883c1
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "mdarray_d"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/mdarray_d.ilproj
new file mode 100644
index 0000000000000..f807ca4c6f019
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj
deleted file mode 100644
index 506344b8ead30..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj
deleted file mode 100644
index 302a93715a18f..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/operand/mdarray_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- PdbOnly
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_r.il b/src/tests/JIT/Methodical/xxobj/operand/mdarray_r.il
new file mode 100644
index 0000000000000..3102fe7d14c0f
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "mdarray_r"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/mdarray_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/mdarray_r.ilproj
new file mode 100644
index 0000000000000..74fc4ac75f8d8
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/mdarray_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ PdbOnly
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval.il b/src/tests/JIT/Methodical/xxobj/operand/refanyval.il
index d76f297ddb7d5..6d6270f397a59 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'refanyval'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.il b/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.il
new file mode 100644
index 0000000000000..7656c7202e7c9
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refanyval_il_d"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj
index e2d6cd2fe578c..b6012ff72aeee 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj
index 561010e7cd5df..03fb2044960e8 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.il b/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.il
new file mode 100644
index 0000000000000..593b840f0afa3
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/refanyval_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "refanyval_il_r"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox.il b/src/tests/JIT/Methodical/xxobj/operand/unbox.il
index cbad046ba6fa1..630ec9f8aab7c 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'unbox'
+.assembly ASSEMBLY_NAME
{
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_d.il b/src/tests/JIT/Methodical/xxobj/operand/unbox_d.il
new file mode 100644
index 0000000000000..785bd1747fb72
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "unbox_il_d"
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj
index e80807c8efa80..3a4d8c5868206 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_d.ilproj
@@ -6,6 +6,7 @@
Full
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj
index 276825cd8ebcf..918ef0726d7a1 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_il_r.ilproj
@@ -6,6 +6,7 @@
PdbOnly
+
diff --git a/src/tests/JIT/Methodical/xxobj/operand/unbox_r.il b/src/tests/JIT/Methodical/xxobj/operand/unbox_r.il
new file mode 100644
index 0000000000000..1df0cdd2df323
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/operand/unbox_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "unbox_il_r"
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 2fbaa72728980..56832fd630aa7 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
@@ -4,7 +4,7 @@
// sizeof32.il
.assembly extern mscorlib { }
.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
-.assembly sizeof32_Target_32Bit_x86 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_d.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_d.il
new file mode 100644
index 0000000000000..815e829aed305
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof32_Target_32Bit_x86_d"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_d.ilproj
new file mode 100644
index 0000000000000..87186c66677dc
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj
deleted file mode 100644
index dd59cbf204685..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj
deleted file mode 100644
index fc766b0ac5a35..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_r.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_r.il
new file mode 100644
index 0000000000000..59ee5f53944ee
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof32_Target_32Bit_x86_r"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_r.ilproj
new file mode 100644
index 0000000000000..b8fe48f58a746
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 2ddab3adba0ab..0384a7ce20ae1 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
@@ -3,7 +3,7 @@
.assembly extern mscorlib { }
.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
-.assembly 'sizeof32_Target_64Bit_and_arm' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_d.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_d.il
new file mode 100644
index 0000000000000..9a5237df62102
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof32_Target_64Bit_and_arm_d"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_d.ilproj
new file mode 100644
index 0000000000000..16138fabfa6c6
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj
deleted file mode 100644
index ccd03c57ca0b5..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj
deleted file mode 100644
index 3360ec5db98b1..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_r.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_r.il
new file mode 100644
index 0000000000000..a93853660ff41
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof32_Target_64Bit_and_arm_r"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_r.ilproj
new file mode 100644
index 0000000000000..f33f8fff27b3f
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 737abf38b62f4..62b2c663bb32c 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
@@ -4,7 +4,7 @@
// sizeof64.il
.assembly extern mscorlib { }
.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
-.assembly sizeof64_Target_32Bit_x86 { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_d.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_d.il
new file mode 100644
index 0000000000000..a2c6e557a5af0
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof64_Target_32Bit_x86_d"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_d.ilproj
new file mode 100644
index 0000000000000..060e2d8245bfd
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+ Full
+
+ true
+ true
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj
deleted file mode 100644
index 343facc09824f..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
- Full
-
- true
- true
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj
deleted file mode 100644
index 005f3f3e07982..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_r.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_r.il
new file mode 100644
index 0000000000000..7ce5c2a672ea8
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof64_Target_32Bit_x86_r"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_r.ilproj
new file mode 100644
index 0000000000000..d3ebd5d8c7dd1
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 64796a342514a..550bde276aeb9 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
@@ -3,7 +3,7 @@
.assembly extern mscorlib { }
.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
-.assembly 'sizeof64_Target_64Bit_and_arm' { }
+.assembly ASSEMBLY_NAME { }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_d.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_d.il
new file mode 100644
index 0000000000000..93d453afff9f8
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof64_Target_64Bit_and_arm_d"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_d.ilproj
new file mode 100644
index 0000000000000..cc04863594e9c
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+ Full
+
+ true
+ true
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj
deleted file mode 100644
index de9dc21bf63b7..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
- Full
-
- true
- true
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj
deleted file mode 100644
index 9573078c396e3..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_r.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_r.il
new file mode 100644
index 0000000000000..344ddf35de81a
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof64_Target_64Bit_and_arm_r"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_r.ilproj
new file mode 100644
index 0000000000000..0e05f79d64dfe
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 7131f8b3c4419..4cc063c3351db 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
@@ -9,7 +9,7 @@
.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
.assembly extern mscorlib { }
-.assembly 'sizeof_Target_32Bit_x86'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_d.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_d.il
new file mode 100644
index 0000000000000..07636b49915e7
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_32Bit_x86_d"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_d.ilproj
new file mode 100644
index 0000000000000..79bcf5b965a93
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj
deleted file mode 100644
index 8d4b6b306c188..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj
deleted file mode 100644
index 3e8c8c98357c6..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_r.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_r.il
new file mode 100644
index 0000000000000..b40b1f7d85529
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_32Bit_x86_r"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_r.ilproj
new file mode 100644
index 0000000000000..274e9fbb3868e
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
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 87bcc2fe9361f..dd926e175beb5 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
@@ -9,7 +9,7 @@
.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) }
.assembly extern mscorlib { }
-.assembly 'sizeof_Target_64Bit_and_arm'
+.assembly ASSEMBLY_NAME
{
}
.assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_d.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_d.il
new file mode 100644
index 0000000000000..8989c64c40b9e
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_64Bit_and_arm_d"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_d.ilproj
new file mode 100644
index 0000000000000..e85afc0f01467
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_d.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ Full
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj
deleted file mode 100644
index e0a0ae7c29439..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- Full
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj
deleted file mode 100644
index 503bd76e6b52f..0000000000000
--- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- true
- 1
-
- true
- true
- PdbOnly
-
-
-
-
-
-
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_r.il b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_r.il
new file mode 100644
index 0000000000000..511ee5817bace
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "sizeof_Target_64Bit_and_arm_r"
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_r.ilproj
new file mode 100644
index 0000000000000..6e022b1999781
--- /dev/null
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_r.ilproj
@@ -0,0 +1,15 @@
+
+
+ true
+ 1
+
+ true
+ true
+ PdbOnly
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557.il
index 0d0438eb93ae4..71b7ac189c091 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557.il
@@ -7,7 +7,7 @@
.ver 4:0:0:0
}
-.assembly 'b323557' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern xunit.core {}
.assembly extern mscorlib{auto}
.class public FullProof {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_d.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_d.il
new file mode 100644
index 0000000000000..dffad924869e2
--- /dev/null
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "b323557_d"
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_d.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_d.ilproj
new file mode 100644
index 0000000000000..3fcaa48d08312
--- /dev/null
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_il_d.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_il_d.ilproj
deleted file mode 100644
index 1c68ce1606776..0000000000000
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_il_r.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_il_r.ilproj
deleted file mode 100644
index 2c350623176ff..0000000000000
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_il_r.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- None
-
-
-
-
-
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_r.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_r.il
new file mode 100644
index 0000000000000..acbe4d370e9d2
--- /dev/null
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "b323557_r"
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_r.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_r.ilproj
new file mode 100644
index 0000000000000..b5c0945191960
--- /dev/null
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557_r.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ None
+
+
+
+
+
+
diff --git a/src/tests/JIT/Regression/Regression_1.csproj b/src/tests/JIT/Regression/Regression_1.csproj
index 0c944fa1a6ffb..5f3bc06ef603b 100644
--- a/src/tests/JIT/Regression/Regression_1.csproj
+++ b/src/tests/JIT/Regression/Regression_1.csproj
@@ -1,13 +1,11 @@
- 10
+ 4
-
-
-
-
+
+
diff --git a/src/tests/JIT/Regression/Regression_2.csproj b/src/tests/JIT/Regression/Regression_2.csproj
index 8dd2341dfd867..209e89a548f4d 100644
--- a/src/tests/JIT/Regression/Regression_2.csproj
+++ b/src/tests/JIT/Regression/Regression_2.csproj
@@ -1,10 +1,6 @@
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_3.csproj b/src/tests/JIT/Regression/Regression_3.csproj
index 58657346ffd6c..4eafe2b2450fb 100644
--- a/src/tests/JIT/Regression/Regression_3.csproj
+++ b/src/tests/JIT/Regression/Regression_3.csproj
@@ -2,10 +2,6 @@
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_4.csproj b/src/tests/JIT/Regression/Regression_4.csproj
index 9e6aa372a15ae..ca1792391bd72 100644
--- a/src/tests/JIT/Regression/Regression_4.csproj
+++ b/src/tests/JIT/Regression/Regression_4.csproj
@@ -4,10 +4,6 @@
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_5.csproj b/src/tests/JIT/Regression/Regression_5.csproj
index 8c264476ce42e..041863a1eb9a7 100644
--- a/src/tests/JIT/Regression/Regression_5.csproj
+++ b/src/tests/JIT/Regression/Regression_5.csproj
@@ -1,13 +1,15 @@
+
+
+
+
+
+
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_6.csproj b/src/tests/JIT/Regression/Regression_6.csproj
new file mode 100644
index 0000000000000..b9fdb63ff425d
--- /dev/null
+++ b/src/tests/JIT/Regression/Regression_6.csproj
@@ -0,0 +1,11 @@
+
+
+ 4
+
+
+
+
+
+
+
+
diff --git a/src/tests/JIT/Regression/Regression_d.csproj b/src/tests/JIT/Regression/Regression_d.csproj
deleted file mode 100644
index f93b0f95a4526..0000000000000
--- a/src/tests/JIT/Regression/Regression_d.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_do.csproj b/src/tests/JIT/Regression/Regression_do.csproj
deleted file mode 100644
index 96b0976b7ccf4..0000000000000
--- a/src/tests/JIT/Regression/Regression_do.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_r.csproj b/src/tests/JIT/Regression/Regression_r.csproj
deleted file mode 100644
index 8764c8887ae4a..0000000000000
--- a/src/tests/JIT/Regression/Regression_r.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/Regression/Regression_ro.csproj b/src/tests/JIT/Regression/Regression_ro.csproj
deleted file mode 100644
index acf22626a849f..0000000000000
--- a/src/tests/JIT/Regression/Regression_ro.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/jit64_1.csproj b/src/tests/JIT/jit64/jit64_1.csproj
new file mode 100644
index 0000000000000..62d82c8233d45
--- /dev/null
+++ b/src/tests/JIT/jit64/jit64_1.csproj
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_2.csproj b/src/tests/JIT/jit64/jit64_2.csproj
new file mode 100644
index 0000000000000..fb77c187be66b
--- /dev/null
+++ b/src/tests/JIT/jit64/jit64_2.csproj
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_3.csproj b/src/tests/JIT/jit64/jit64_3.csproj
new file mode 100644
index 0000000000000..e1067b1150310
--- /dev/null
+++ b/src/tests/JIT/jit64/jit64_3.csproj
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_4.csproj b/src/tests/JIT/jit64/jit64_4.csproj
new file mode 100644
index 0000000000000..ac7ebca5eaf3b
--- /dev/null
+++ b/src/tests/JIT/jit64/jit64_4.csproj
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_5.csproj b/src/tests/JIT/jit64/jit64_5.csproj
new file mode 100644
index 0000000000000..e50471da9132e
--- /dev/null
+++ b/src/tests/JIT/jit64/jit64_5.csproj
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_d.csproj b/src/tests/JIT/jit64/jit64_d.csproj
deleted file mode 100644
index 10468f5e194df..0000000000000
--- a/src/tests/JIT/jit64/jit64_d.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_do.csproj b/src/tests/JIT/jit64/jit64_do.csproj
deleted file mode 100644
index 94b1f9e899c78..0000000000000
--- a/src/tests/JIT/jit64/jit64_do.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_others.csproj b/src/tests/JIT/jit64/jit64_others.csproj
deleted file mode 100644
index 19296391f28ee..0000000000000
--- a/src/tests/JIT/jit64/jit64_others.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_r.csproj b/src/tests/JIT/jit64/jit64_r.csproj
deleted file mode 100644
index 036161a191b99..0000000000000
--- a/src/tests/JIT/jit64/jit64_r.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/jit64_ro.csproj b/src/tests/JIT/jit64/jit64_ro.csproj
deleted file mode 100644
index 2d0399b4354a6..0000000000000
--- a/src/tests/JIT/jit64/jit64_ro.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp.il b/src/tests/JIT/jit64/opt/cg/il/jmp.il
index 94439445ed46f..62917884fa759 100644
--- a/src/tests/JIT/jit64/opt/cg/il/jmp.il
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp.il
@@ -9,7 +9,7 @@
.ver 4:0:0:0
}
-.assembly 'jmp' {
+.assembly ASSEMBLY_NAME {
//This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
//[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
}
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp.ilproj b/src/tests/JIT/jit64/opt/cg/il/jmp.ilproj
deleted file mode 100644
index cc4cd1209e89d..0000000000000
--- a/src/tests/JIT/jit64/opt/cg/il/jmp.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- Impl
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_d.il b/src/tests/JIT/jit64/opt/cg/il/jmp_d.il
new file mode 100644
index 0000000000000..8718175030687
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jmp_d"
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_d.ilproj b/src/tests/JIT/jit64/opt/cg/il/jmp_d.ilproj
new file mode 100644
index 0000000000000..ae7a53f408c7f
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_do.il b/src/tests/JIT/jit64/opt/cg/il/jmp_do.il
new file mode 100644
index 0000000000000..38912af2f3b63
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp_do.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jmp_do"
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_do.ilproj b/src/tests/JIT/jit64/opt/cg/il/jmp_do.ilproj
new file mode 100644
index 0000000000000..fed3c028c900f
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp_do.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_il_d.ilproj b/src/tests/JIT/jit64/opt/cg/il/jmp_il_d.ilproj
deleted file mode 100644
index 499525c6dbd34..0000000000000
--- a/src/tests/JIT/jit64/opt/cg/il/jmp_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_il_do.ilproj b/src/tests/JIT/jit64/opt/cg/il/jmp_il_do.ilproj
deleted file mode 100644
index c7bb4379e6e86..0000000000000
--- a/src/tests/JIT/jit64/opt/cg/il/jmp_il_do.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_impl.il b/src/tests/JIT/jit64/opt/cg/il/jmp_impl.il
new file mode 100644
index 0000000000000..2cf95bd06aabf
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp_impl.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "jmp_impl"
diff --git a/src/tests/JIT/jit64/opt/cg/il/jmp_impl.ilproj b/src/tests/JIT/jit64/opt/cg/il/jmp_impl.ilproj
new file mode 100644
index 0000000000000..1c97da530f485
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/jmp_impl.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ Impl
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn.il b/src/tests/JIT/jit64/opt/cg/il/ldftn.il
index 836d71eb62cb2..171a7bafbef00 100644
--- a/src/tests/JIT/jit64/opt/cg/il/ldftn.il
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn.il
@@ -8,7 +8,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
-.assembly 'ldftn'{}
+.assembly ASSEMBLY_NAME {}
.method public static int32 Foo()
{
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn.ilproj b/src/tests/JIT/jit64/opt/cg/il/ldftn.ilproj
deleted file mode 100644
index 51fcf32bf190e..0000000000000
--- a/src/tests/JIT/jit64/opt/cg/il/ldftn.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- Impl
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_d.il b/src/tests/JIT/jit64/opt/cg/il/ldftn_d.il
new file mode 100644
index 0000000000000..41eeca1a29b78
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldftn_d"
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_d.ilproj b/src/tests/JIT/jit64/opt/cg/il/ldftn_d.ilproj
new file mode 100644
index 0000000000000..3b85fd69d5806
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_do.il b/src/tests/JIT/jit64/opt/cg/il/ldftn_do.il
new file mode 100644
index 0000000000000..ee2f937199539
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn_do.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldftn_do"
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_do.ilproj b/src/tests/JIT/jit64/opt/cg/il/ldftn_do.ilproj
new file mode 100644
index 0000000000000..9d48ae9f2cd54
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn_do.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_il_d.ilproj b/src/tests/JIT/jit64/opt/cg/il/ldftn_il_d.ilproj
deleted file mode 100644
index 216dcc5450d46..0000000000000
--- a/src/tests/JIT/jit64/opt/cg/il/ldftn_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_il_do.ilproj b/src/tests/JIT/jit64/opt/cg/il/ldftn_il_do.ilproj
deleted file mode 100644
index 2ae87b973a66e..0000000000000
--- a/src/tests/JIT/jit64/opt/cg/il/ldftn_il_do.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_impl.il b/src/tests/JIT/jit64/opt/cg/il/ldftn_impl.il
new file mode 100644
index 0000000000000..d439de2ea4340
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn_impl.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "ldftn_impl"
diff --git a/src/tests/JIT/jit64/opt/cg/il/ldftn_impl.ilproj b/src/tests/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
new file mode 100644
index 0000000000000..8de351d179a78
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ Impl
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il
index 959b80a07f29c..6189dfee83eea 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'bne' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public cprop_test {
.method public static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.ilproj
deleted file mode 100644
index 8fbb6939068af..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_d.il
new file mode 100644
index 0000000000000..aaa69add9f9ef
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "bne_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_d.ilproj
new file mode 100644
index 0000000000000..08a832716e8f5
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_il_d.ilproj
deleted file mode 100644
index 87e15bd879d41..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_r.il
new file mode 100644
index 0000000000000..d6c18a3a50e3e
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "bne_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_r.ilproj
new file mode 100644
index 0000000000000..56fd4201f1e2b
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il
index 78286faf93421..fed434a7ad7c6 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'conv_223862' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public Class_test {
.method public static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_d.ilproj
new file mode 100644
index 0000000000000..d998802a83b2c
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_il_d.ilproj
deleted file mode 100644
index 60ff29c2b0d38..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_il_r.ilproj
deleted file mode 100644
index 55a7af88c57e9..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_r.ilproj
new file mode 100644
index 0000000000000..ada223c66e857
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_223862_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_d.il
new file mode 100644
index 0000000000000..c20e97229aeed
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_223862_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_r.il
new file mode 100644
index 0000000000000..d2700b9cd304d
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_223862_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il
index fd9d98d0d52e2..0ea9eeb0fd93c 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'div' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public cprop_test {
.method public static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_d.il
new file mode 100644
index 0000000000000..571c1e11feb37
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "div_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_d.ilproj
new file mode 100644
index 0000000000000..8ac731f7841ac
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_il_d.ilproj
deleted file mode 100644
index 9154e33dc0ce1..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_il_r.ilproj
deleted file mode 100644
index 1ea3b9d938dd8..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_r.il
new file mode 100644
index 0000000000000..4aec5d5d113cf
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "div_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_r.ilproj
new file mode 100644
index 0000000000000..3f1d1164f5eb2
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il
index 6d4984ba9e8da..e17d038932066 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'mul1' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public cprop_test {
.method public static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_d.il
new file mode 100644
index 0000000000000..3745caa9b17a1
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "mul1_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_d.ilproj
new file mode 100644
index 0000000000000..8c0d9dec15342
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_il_d.ilproj
deleted file mode 100644
index 72dbe28ce4ba6..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_il_r.ilproj
deleted file mode 100644
index a14108bae79d7..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_r.il
new file mode 100644
index 0000000000000..ca159c5f4fd07
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "mul1_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_r.ilproj
new file mode 100644
index 0000000000000..54ec62eb21c4d
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il
index 1b54cf28ae51a..d9f921b614089 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'mul_exception' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public cprop_test {
.method public static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_d.il
new file mode 100644
index 0000000000000..629b2d848b531
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "mul_exception_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_d.ilproj
new file mode 100644
index 0000000000000..9fdc2e360403b
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_il_d.ilproj
deleted file mode 100644
index fb97209469fb8..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_il_r.ilproj
deleted file mode 100644
index 5ff0d27ee6cba..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_r.il
new file mode 100644
index 0000000000000..6c14de9574af9
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "mul_exception_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_r.ilproj
new file mode 100644
index 0000000000000..bcde4d10583ff
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il
index 81030c362eff3..e116da21c4a80 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'rem' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public cprop_test {
.method public static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_d.il
new file mode 100644
index 0000000000000..1938297043acc
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rem_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_d.ilproj
new file mode 100644
index 0000000000000..b5ff74ef50c8b
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_il_d.ilproj
deleted file mode 100644
index d279e9c7f90c7..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_il_r.ilproj
deleted file mode 100644
index 29dd045378f99..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_r.il
new file mode 100644
index 0000000000000..312a7f21ea567
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "rem_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_r.ilproj
new file mode 100644
index 0000000000000..9b57e2f0d745e
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il
index 067c68280b711..a6160da1eaee5 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il
@@ -8,7 +8,7 @@
}
.assembly extern xunit.core {}
-.assembly 'conv_228572' {}
+.assembly ASSEMBLY_NAME {}
.assembly extern mscorlib{auto}
.class public Conv_test {
.method static int32 Main_test() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_d.ilproj
new file mode 100644
index 0000000000000..d998802a83b2c
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_d.ilproj
@@ -0,0 +1,9 @@
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_il_d.ilproj
deleted file mode 100644
index 60ff29c2b0d38..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_il_d.ilproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_il_r.ilproj
deleted file mode 100644
index 55a7af88c57e9..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_il_r.ilproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_r.ilproj
new file mode 100644
index 0000000000000..ada223c66e857
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_228572_r.ilproj
@@ -0,0 +1,10 @@
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_d.il
new file mode 100644
index 0000000000000..1629b08212190
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_228572_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_r.il
new file mode 100644
index 0000000000000..9757dd341d37a
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "conv_228572_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il
index b414b1a1fbec6..cbda14b69fdfa 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il
@@ -11,7 +11,7 @@
.ver 2:0:0:0
}
.assembly extern xunit.core {}
-.assembly foo
+.assembly ASSEMBLY_NAME
{
}
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
index 224c68326387f..8e11e5e9ccecf 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
@@ -11,7 +11,7 @@
.ver 2:0:0:0
}
.assembly extern xunit.core {}
-.assembly 'foo2'
+.assembly ASSEMBLY_NAME
{
}
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_d.il
new file mode 100644
index 0000000000000..0335cc904aee4
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "foo2_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_d.ilproj
new file mode 100644
index 0000000000000..f96a328ce0ac0
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_il_d.ilproj
deleted file mode 100644
index 82c598bb38387..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_il_r.ilproj
deleted file mode 100644
index f117f1cf696b4..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_r.il
new file mode 100644
index 0000000000000..7e0a5fb5f0c47
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "foo2_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_r.ilproj
new file mode 100644
index 0000000000000..0a5efc0db6f05
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_d.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_d.il
new file mode 100644
index 0000000000000..7928242a29465
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_d.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "foo_d"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_d.ilproj
new file mode 100644
index 0000000000000..256cab0cc1cac
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_d.ilproj
@@ -0,0 +1,12 @@
+
+
+ 1
+
+
+ Full
+
+
+
+
+
+
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_il_d.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_il_d.ilproj
deleted file mode 100644
index 9fbd02e5acb8a..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_il_d.ilproj
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 1
-
-
- Full
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_il_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_il_r.ilproj
deleted file mode 100644
index df4c7fb742fef..0000000000000
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_il_r.ilproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- 1
-
-
- PdbOnly
- True
-
-
-
-
-
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_r.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_r.il
new file mode 100644
index 0000000000000..0795098bc74c0
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_r.il
@@ -0,0 +1 @@
+#define ASSEMBLY_NAME "foo_r"
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_r.ilproj b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_r.ilproj
new file mode 100644
index 0000000000000..61e96eecf5e6b
--- /dev/null
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo_r.ilproj
@@ -0,0 +1,13 @@
+
+
+ 1
+
+
+ PdbOnly
+ True
+
+
+
+
+
+
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 02dc07ab9a940..cfbfbd3175701 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -324,10 +324,10 @@
https://github.com/dotnet/runtime/issues/57621
-
+
https://github.com/dotnet/runtime/issues/10478
-
+
https://github.com/dotnet/runtime/issues/10478
@@ -540,10 +540,10 @@
needs triage
-
+
needs triage
-
+
needs triage
@@ -925,22 +925,22 @@
https://github.com/dotnet/runtimelab/issues/183
-
+
https://github.com/dotnet/runtimelab/issues/155: RuntimeHelpers.InitializeArray
-
+
https://github.com/dotnet/runtimelab/issues/155: RuntimeHelpers.InitializeArray
-
+
https://github.com/dotnet/runtimelab/issues/155: Non-exception throw
-
+
https://github.com/dotnet/runtimelab/issues/155: Non-exception throw
-
+
https://github.com/dotnet/runtimelab/issues/155: Non-exception throw
-
+
https://github.com/dotnet/runtimelab/issues/155: Non-exception throw
@@ -1115,40 +1115,40 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1540,10 +1540,10 @@
needs triage
-
+
needs triage
-
+
needs triage
@@ -1618,13 +1618,13 @@
needs triage
-
+
https://github.com/dotnet/runtime/issues/34196
-
+
https://github.com/dotnet/runtime/issues/67756
-
+
https://github.com/dotnet/runtime/issues/67756
@@ -2051,10 +2051,10 @@
needs triage
-
+
needs triage
-
+
needs triage
@@ -2081,7 +2081,7 @@
needs triage
-
+
needs triage
@@ -2096,7 +2096,7 @@
needs triage
-
+
needs triage
@@ -2111,7 +2111,7 @@
needs triage
-
+
needs triage
@@ -2123,10 +2123,10 @@
needs triage
-
+
needs triage
-
+
needs triage
@@ -2138,61 +2138,61 @@
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
@@ -2204,13 +2204,13 @@
https://github.com/dotnet/runtime/issues/54392
-
+
https://github.com/dotnet/runtime/issues/54388
https://github.com/dotnet/runtime/issues/54393
-
+
needs triage
@@ -2222,7 +2222,7 @@
https://github.com/dotnet/runtime/issues/54393
-
+
needs triage
@@ -2231,7 +2231,7 @@
https://github.com/dotnet/runtime/issues/54393
-
+
https://github.com/dotnet/runtime/issues/54388
@@ -2267,28 +2267,28 @@
needs triage
-
+
needs triage
-
+
needs triage
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
-
+
needs triage
@@ -2297,10 +2297,10 @@
needs triage
-
+
needs triage
-
+
https://github.com/dotnet/runtime/issues/54388
@@ -2309,13 +2309,13 @@
needs triage
-
+
https://github.com/dotnet/runtime/issues/54388
https://github.com/dotnet/runtime/issues/54388
-
+
needs triage
@@ -2405,13 +2405,13 @@
https://github.com/dotnet/runtime/issues/54399
-
+
needs triage
https://github.com/dotnet/runtime/issues/54392
-
+
needs triage
@@ -2429,10 +2429,10 @@
needs triage
-
+
https://github.com/dotnet/runtime/issues/47624
-
+
https://github.com/dotnet/runtime/issues/47624
@@ -2445,13 +2445,13 @@
-
+
needs triage
-
+
needs triage
-
+
needs triage
@@ -2654,13 +2654,13 @@
https://github.com/dotnet/runtime/issues/70492
-
+
https://github.com/dotnet/runtime/issues/57369
-
+
https://github.com/dotnet/runtime/issues/57369
-
+
https://github.com/dotnet/runtime/issues/57369
@@ -2691,28 +2691,25 @@
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
- https://github.com/dotnet/runtime/issues/57350
-
-
+
https://github.com/dotnet/runtime/issues/57350
@@ -2724,22 +2721,22 @@
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
-
+
https://github.com/dotnet/runtime/issues/57350
@@ -3136,28 +3133,28 @@
needs triage
-
+
needs triage
needs triage
-
+
needs triage
needs triage
-
+
needs triage
-
+
needs triage
needs triage
-
+
needs triage
@@ -3175,7 +3172,7 @@
needs triage
-
+
needs triage
@@ -3190,7 +3187,7 @@
needs triage
-
+
needs triage
@@ -3205,7 +3202,7 @@
needs triage
-
+
needs triage
@@ -3395,10 +3392,10 @@
https://github.com/dotnet/runtime/issues/41472
-
+
needs triage
-
+
needs triage
@@ -3764,19 +3761,19 @@
https://github.com/dotnet/runtime/issues/54911
-
+
https://github.com/dotnet/runtime/issues/54911
-
+
https://github.com/dotnet/runtime/issues/54911
-
+
https://github.com/dotnet/runtime/issues/54911
https://github.com/dotnet/runtime/issues/54911
-
+
https://github.com/dotnet/runtime/issues/54911