Deduplicate project files with the same name in different folders (do…

…tnet#64841) This is a somewhat annoying aspect hitting less than 10% of the JIT/Methodical subtree: as the new merged wrapper logic is based on simple assembly names, we cannot merge multiple test projects that produce a test assembly with the same name otherwise such assemblies stomp over each other when getting copied to the merged wrapper folder. I have added a new option to ILTransform to include the directory name in the project names in these cases. We can remove some of this in the future when selectively merging actual test source code (compiling multiple tests into a single asssembly). Thanks Tomas
radekdoulik · Mar 30, 2022 · 3429924 · 3429924
1 parent a5fb81d
commit 3429924
Show file tree

Hide file tree

Showing 149 changed files with 42 additions and 42 deletions.
diff --git a/...ts/JIT/Methodical/Arrays/lcs/lcs_d.csproj → ...IT/Methodical/Arrays/lcs/lcs_lcs_d.csproj b/...ts/JIT/Methodical/Arrays/lcs/lcs_d.csproj → ...IT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
diff --git a/...s/JIT/Methodical/Arrays/lcs/lcs_do.csproj → ...T/Methodical/Arrays/lcs/lcs_lcs_do.csproj b/...s/JIT/Methodical/Arrays/lcs/lcs_do.csproj → ...T/Methodical/Arrays/lcs/lcs_lcs_do.csproj
diff --git a/...ts/JIT/Methodical/Arrays/lcs/lcs_r.csproj → ...IT/Methodical/Arrays/lcs/lcs_lcs_r.csproj b/...ts/JIT/Methodical/Arrays/lcs/lcs_r.csproj → ...IT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
diff --git a/...s/JIT/Methodical/Arrays/lcs/lcs_ro.csproj → ...T/Methodical/Arrays/lcs/lcs_lcs_ro.csproj b/...s/JIT/Methodical/Arrays/lcs/lcs_ro.csproj → ...T/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
diff --git 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' { }
+.assembly 'localloc_boxunbox' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {

diff --git a/...ical/Boxing/boxunbox/localloc_il_d.ilproj → ...ng/boxunbox/localloc_boxunbox_il_d.ilproj b/...ical/Boxing/boxunbox/localloc_il_d.ilproj → ...ng/boxunbox/localloc_boxunbox_il_d.ilproj
diff --git a/...ical/Boxing/boxunbox/localloc_il_r.ilproj → ...ng/boxunbox/localloc_boxunbox_il_r.ilproj b/...ical/Boxing/boxunbox/localloc_il_r.ilproj → ...ng/boxunbox/localloc_boxunbox_il_r.ilproj
diff --git 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' { }
+.assembly 'tailcall_boxunbox' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {

diff --git a/...ical/Boxing/boxunbox/tailcall_il_d.ilproj → ...ng/boxunbox/tailcall_boxunbox_il_d.ilproj b/...ical/Boxing/boxunbox/tailcall_il_d.ilproj → ...ng/boxunbox/tailcall_boxunbox_il_d.ilproj
diff --git a/...ical/Boxing/boxunbox/tailcall_il_r.ilproj → ...ng/boxunbox/tailcall_boxunbox_il_r.ilproj b/...ical/Boxing/boxunbox/tailcall_il_r.ilproj → ...ng/boxunbox/tailcall_boxunbox_il_r.ilproj
diff --git 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' { }
+.assembly 'try_boxunbox' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {

diff --git a/...ethodical/Boxing/boxunbox/try_il_d.ilproj → .../Boxing/boxunbox/try_boxunbox_il_d.ilproj b/...ethodical/Boxing/boxunbox/try_il_d.ilproj → .../Boxing/boxunbox/try_boxunbox_il_d.ilproj
diff --git a/...ethodical/Boxing/boxunbox/try_il_r.ilproj → .../Boxing/boxunbox/try_boxunbox_il_r.ilproj b/...ethodical/Boxing/boxunbox/try_il_r.ilproj → .../Boxing/boxunbox/try_boxunbox_il_r.ilproj
diff --git a/...hodical/Boxing/functional/sin_cs_d.csproj → ...ing/functional/sin_functional_cs_d.csproj b/...hodical/Boxing/functional/sin_cs_d.csproj → ...ing/functional/sin_functional_cs_d.csproj
diff --git a/...odical/Boxing/functional/sin_cs_do.csproj → ...ng/functional/sin_functional_cs_do.csproj b/...odical/Boxing/functional/sin_cs_do.csproj → ...ng/functional/sin_functional_cs_do.csproj
diff --git a/...hodical/Boxing/functional/sin_cs_r.csproj → ...ing/functional/sin_functional_cs_r.csproj b/...hodical/Boxing/functional/sin_cs_r.csproj → ...ing/functional/sin_functional_cs_r.csproj
diff --git a/...odical/Boxing/functional/sin_cs_ro.csproj → ...ng/functional/sin_functional_cs_ro.csproj b/...odical/Boxing/functional/sin_cs_ro.csproj → ...ng/functional/sin_functional_cs_ro.csproj
diff --git a/...T/Methodical/Boxing/morph/sin_cs_d.csproj → ...odical/Boxing/morph/sin_morph_cs_d.csproj b/...T/Methodical/Boxing/morph/sin_cs_d.csproj → ...odical/Boxing/morph/sin_morph_cs_d.csproj
diff --git a/.../Methodical/Boxing/morph/sin_cs_do.csproj → ...dical/Boxing/morph/sin_morph_cs_do.csproj b/.../Methodical/Boxing/morph/sin_cs_do.csproj → ...dical/Boxing/morph/sin_morph_cs_do.csproj
diff --git a/...T/Methodical/Boxing/morph/sin_cs_r.csproj → ...odical/Boxing/morph/sin_morph_cs_r.csproj b/...T/Methodical/Boxing/morph/sin_cs_r.csproj → ...odical/Boxing/morph/sin_morph_cs_r.csproj
diff --git a/.../Methodical/Boxing/morph/sin_cs_ro.csproj → ...dical/Boxing/morph/sin_morph_cs_ro.csproj b/.../Methodical/Boxing/morph/sin_cs_ro.csproj → ...dical/Boxing/morph/sin_morph_cs_ro.csproj
diff --git 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' { }
+.assembly 'filter_seh_Boxing' { }
 .assembly extern xunit.core {}
 .namespace SinCalc
 {

diff --git a/.../Methodical/Boxing/seh/filter_il_d.ilproj → .../Boxing/seh/filter_seh_Boxing_il_d.ilproj b/.../Methodical/Boxing/seh/filter_il_d.ilproj → .../Boxing/seh/filter_seh_Boxing_il_d.ilproj
diff --git a/.../Methodical/Boxing/seh/filter_il_r.ilproj → .../Boxing/seh/filter_seh_Boxing_il_r.ilproj b/.../Methodical/Boxing/seh/filter_il_r.ilproj → .../Boxing/seh/filter_seh_Boxing_il_r.ilproj
diff --git 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' { }
+.assembly 'try_seh' { }
 .assembly extern xunit.core {}
 .namespace SinCalc
 {

diff --git a/...JIT/Methodical/Boxing/seh/try_il_d.ilproj → ...Methodical/Boxing/seh/try_seh_il_d.ilproj b/...JIT/Methodical/Boxing/seh/try_il_d.ilproj → ...Methodical/Boxing/seh/try_seh_il_d.ilproj
diff --git a/...JIT/Methodical/Boxing/seh/try_il_r.ilproj → ...Methodical/Boxing/seh/try_seh_il_r.ilproj b/...JIT/Methodical/Boxing/seh/try_il_r.ilproj → ...Methodical/Boxing/seh/try_seh_il_r.ilproj
diff --git a/.../MDArray/GaussJordan/classarr_cs_d.csproj → ...ssJordan/classarr_GaussJordan_cs_d.csproj b/.../MDArray/GaussJordan/classarr_cs_d.csproj → ...ssJordan/classarr_GaussJordan_cs_d.csproj
diff --git a/...MDArray/GaussJordan/classarr_cs_do.csproj → ...sJordan/classarr_GaussJordan_cs_do.csproj b/...MDArray/GaussJordan/classarr_cs_do.csproj → ...sJordan/classarr_GaussJordan_cs_do.csproj
diff --git a/.../MDArray/GaussJordan/classarr_cs_r.csproj → ...ssJordan/classarr_GaussJordan_cs_r.csproj b/.../MDArray/GaussJordan/classarr_cs_r.csproj → ...ssJordan/classarr_GaussJordan_cs_r.csproj
diff --git a/...MDArray/GaussJordan/classarr_cs_ro.csproj → ...sJordan/classarr_GaussJordan_cs_ro.csproj b/...MDArray/GaussJordan/classarr_cs_ro.csproj → ...sJordan/classarr_GaussJordan_cs_ro.csproj
diff --git a/...MDArray/GaussJordan/jaggedarr_cs_d.csproj → ...sJordan/jaggedarr_GaussJordan_cs_d.csproj b/...MDArray/GaussJordan/jaggedarr_cs_d.csproj → ...sJordan/jaggedarr_GaussJordan_cs_d.csproj
diff --git a/...DArray/GaussJordan/jaggedarr_cs_do.csproj → ...Jordan/jaggedarr_GaussJordan_cs_do.csproj b/...DArray/GaussJordan/jaggedarr_cs_do.csproj → ...Jordan/jaggedarr_GaussJordan_cs_do.csproj
diff --git a/...MDArray/GaussJordan/jaggedarr_cs_r.csproj → ...sJordan/jaggedarr_GaussJordan_cs_r.csproj b/...MDArray/GaussJordan/jaggedarr_cs_r.csproj → ...sJordan/jaggedarr_GaussJordan_cs_r.csproj
diff --git a/...DArray/GaussJordan/jaggedarr_cs_ro.csproj → ...Jordan/jaggedarr_GaussJordan_cs_ro.csproj b/...DArray/GaussJordan/jaggedarr_cs_ro.csproj → ...Jordan/jaggedarr_GaussJordan_cs_ro.csproj
diff --git a/...MDArray/GaussJordan/structarr_cs_d.csproj → ...sJordan/structarr_GaussJordan_cs_d.csproj b/...MDArray/GaussJordan/structarr_cs_d.csproj → ...sJordan/structarr_GaussJordan_cs_d.csproj
diff --git a/...DArray/GaussJordan/structarr_cs_do.csproj → ...Jordan/structarr_GaussJordan_cs_do.csproj b/...DArray/GaussJordan/structarr_cs_do.csproj → ...Jordan/structarr_GaussJordan_cs_do.csproj
diff --git a/...MDArray/GaussJordan/structarr_cs_r.csproj → ...sJordan/structarr_GaussJordan_cs_r.csproj b/...MDArray/GaussJordan/structarr_cs_r.csproj → ...sJordan/structarr_GaussJordan_cs_r.csproj
diff --git a/...DArray/GaussJordan/structarr_cs_ro.csproj → ...Jordan/structarr_GaussJordan_cs_ro.csproj b/...DArray/GaussJordan/structarr_cs_ro.csproj → ...Jordan/structarr_GaussJordan_cs_ro.csproj
diff --git a/...al/MDArray/InnerProd/classarr_cs_d.csproj → .../InnerProd/classarr_InnerProd_cs_d.csproj b/...al/MDArray/InnerProd/classarr_cs_d.csproj → .../InnerProd/classarr_InnerProd_cs_d.csproj
diff --git a/...l/MDArray/InnerProd/classarr_cs_do.csproj → ...InnerProd/classarr_InnerProd_cs_do.csproj b/...l/MDArray/InnerProd/classarr_cs_do.csproj → ...InnerProd/classarr_InnerProd_cs_do.csproj
diff --git a/...al/MDArray/InnerProd/classarr_cs_r.csproj → .../InnerProd/classarr_InnerProd_cs_r.csproj b/...al/MDArray/InnerProd/classarr_cs_r.csproj → .../InnerProd/classarr_InnerProd_cs_r.csproj
diff --git a/...l/MDArray/InnerProd/classarr_cs_ro.csproj → ...InnerProd/classarr_InnerProd_cs_ro.csproj b/...l/MDArray/InnerProd/classarr_cs_ro.csproj → ...InnerProd/classarr_InnerProd_cs_ro.csproj
diff --git a/...l/MDArray/InnerProd/doublearr_cs_d.csproj → ...InnerProd/doublearr_InnerProd_cs_d.csproj b/...l/MDArray/InnerProd/doublearr_cs_d.csproj → ...InnerProd/doublearr_InnerProd_cs_d.csproj
diff --git a/.../MDArray/InnerProd/doublearr_cs_do.csproj → ...nnerProd/doublearr_InnerProd_cs_do.csproj b/.../MDArray/InnerProd/doublearr_cs_do.csproj → ...nnerProd/doublearr_InnerProd_cs_do.csproj
diff --git a/...l/MDArray/InnerProd/doublearr_cs_r.csproj → ...InnerProd/doublearr_InnerProd_cs_r.csproj b/...l/MDArray/InnerProd/doublearr_cs_r.csproj → ...InnerProd/doublearr_InnerProd_cs_r.csproj
diff --git a/.../MDArray/InnerProd/doublearr_cs_ro.csproj → ...nnerProd/doublearr_InnerProd_cs_ro.csproj b/.../MDArray/InnerProd/doublearr_cs_ro.csproj → ...nnerProd/doublearr_InnerProd_cs_ro.csproj
diff --git a/...l/MDArray/InnerProd/jaggedarr_cs_d.csproj → ...InnerProd/jaggedarr_InnerProd_cs_d.csproj b/...l/MDArray/InnerProd/jaggedarr_cs_d.csproj → ...InnerProd/jaggedarr_InnerProd_cs_d.csproj
diff --git a/.../MDArray/InnerProd/jaggedarr_cs_do.csproj → ...nnerProd/jaggedarr_InnerProd_cs_do.csproj b/.../MDArray/InnerProd/jaggedarr_cs_do.csproj → ...nnerProd/jaggedarr_InnerProd_cs_do.csproj
diff --git a/...l/MDArray/InnerProd/jaggedarr_cs_r.csproj → ...InnerProd/jaggedarr_InnerProd_cs_r.csproj b/...l/MDArray/InnerProd/jaggedarr_cs_r.csproj → ...InnerProd/jaggedarr_InnerProd_cs_r.csproj
diff --git a/.../MDArray/InnerProd/jaggedarr_cs_ro.csproj → ...nnerProd/jaggedarr_InnerProd_cs_ro.csproj b/.../MDArray/InnerProd/jaggedarr_cs_ro.csproj → ...nnerProd/jaggedarr_InnerProd_cs_ro.csproj
diff --git a/...l/MDArray/InnerProd/stringarr_cs_d.csproj → ...InnerProd/stringarr_InnerProd_cs_d.csproj b/...l/MDArray/InnerProd/stringarr_cs_d.csproj → ...InnerProd/stringarr_InnerProd_cs_d.csproj
diff --git a/.../MDArray/InnerProd/stringarr_cs_do.csproj → ...nnerProd/stringarr_InnerProd_cs_do.csproj b/.../MDArray/InnerProd/stringarr_cs_do.csproj → ...nnerProd/stringarr_InnerProd_cs_do.csproj
diff --git a/...l/MDArray/InnerProd/stringarr_cs_r.csproj → ...InnerProd/stringarr_InnerProd_cs_r.csproj b/...l/MDArray/InnerProd/stringarr_cs_r.csproj → ...InnerProd/stringarr_InnerProd_cs_r.csproj
diff --git a/.../MDArray/InnerProd/stringarr_cs_ro.csproj → ...nnerProd/stringarr_InnerProd_cs_ro.csproj b/.../MDArray/InnerProd/stringarr_cs_ro.csproj → ...nnerProd/stringarr_InnerProd_cs_ro.csproj
diff --git a/...l/MDArray/InnerProd/structarr_cs_d.csproj → ...InnerProd/structarr_InnerProd_cs_d.csproj b/...l/MDArray/InnerProd/structarr_cs_d.csproj → ...InnerProd/structarr_InnerProd_cs_d.csproj
diff --git a/.../MDArray/InnerProd/structarr_cs_do.csproj → ...nnerProd/structarr_InnerProd_cs_do.csproj b/.../MDArray/InnerProd/structarr_cs_do.csproj → ...nnerProd/structarr_InnerProd_cs_do.csproj
diff --git a/...l/MDArray/InnerProd/structarr_cs_r.csproj → ...InnerProd/structarr_InnerProd_cs_r.csproj b/...l/MDArray/InnerProd/structarr_cs_r.csproj → ...InnerProd/structarr_InnerProd_cs_r.csproj
diff --git a/.../MDArray/InnerProd/structarr_cs_ro.csproj → ...nnerProd/structarr_InnerProd_cs_ro.csproj b/.../MDArray/InnerProd/structarr_cs_ro.csproj → ...nnerProd/structarr_InnerProd_cs_ro.csproj
diff --git a/...dical/MDArray/basics/classarr_cs_d.csproj → ...DArray/basics/classarr_basics_cs_d.csproj b/...dical/MDArray/basics/classarr_cs_d.csproj → ...DArray/basics/classarr_basics_cs_d.csproj
diff --git a/...ical/MDArray/basics/classarr_cs_do.csproj → ...Array/basics/classarr_basics_cs_do.csproj b/...ical/MDArray/basics/classarr_cs_do.csproj → ...Array/basics/classarr_basics_cs_do.csproj
diff --git a/...dical/MDArray/basics/classarr_cs_r.csproj → ...DArray/basics/classarr_basics_cs_r.csproj b/...dical/MDArray/basics/classarr_cs_r.csproj → ...DArray/basics/classarr_basics_cs_r.csproj
diff --git a/...ical/MDArray/basics/classarr_cs_ro.csproj → ...Array/basics/classarr_basics_cs_ro.csproj b/...ical/MDArray/basics/classarr_cs_ro.csproj → ...Array/basics/classarr_basics_cs_ro.csproj
diff --git a/...ical/MDArray/basics/doublearr_cs_d.csproj → ...Array/basics/doublearr_basics_cs_d.csproj b/...ical/MDArray/basics/doublearr_cs_d.csproj → ...Array/basics/doublearr_basics_cs_d.csproj
diff --git a/...cal/MDArray/basics/doublearr_cs_do.csproj → ...rray/basics/doublearr_basics_cs_do.csproj b/...cal/MDArray/basics/doublearr_cs_do.csproj → ...rray/basics/doublearr_basics_cs_do.csproj
diff --git a/...ical/MDArray/basics/doublearr_cs_r.csproj → ...Array/basics/doublearr_basics_cs_r.csproj b/...ical/MDArray/basics/doublearr_cs_r.csproj → ...Array/basics/doublearr_basics_cs_r.csproj
diff --git a/...cal/MDArray/basics/doublearr_cs_ro.csproj → ...rray/basics/doublearr_basics_cs_ro.csproj b/...cal/MDArray/basics/doublearr_cs_ro.csproj → ...rray/basics/doublearr_basics_cs_ro.csproj
diff --git a/...ical/MDArray/basics/jaggedarr_cs_d.csproj → ...Array/basics/jaggedarr_basics_cs_d.csproj b/...ical/MDArray/basics/jaggedarr_cs_d.csproj → ...Array/basics/jaggedarr_basics_cs_d.csproj
diff --git a/...cal/MDArray/basics/jaggedarr_cs_do.csproj → ...rray/basics/jaggedarr_basics_cs_do.csproj b/...cal/MDArray/basics/jaggedarr_cs_do.csproj → ...rray/basics/jaggedarr_basics_cs_do.csproj
diff --git a/...ical/MDArray/basics/jaggedarr_cs_r.csproj → ...Array/basics/jaggedarr_basics_cs_r.csproj b/...ical/MDArray/basics/jaggedarr_cs_r.csproj → ...Array/basics/jaggedarr_basics_cs_r.csproj
diff --git a/...cal/MDArray/basics/jaggedarr_cs_ro.csproj → ...rray/basics/jaggedarr_basics_cs_ro.csproj b/...cal/MDArray/basics/jaggedarr_cs_ro.csproj → ...rray/basics/jaggedarr_basics_cs_ro.csproj
diff --git a/...ical/MDArray/basics/stringarr_cs_d.csproj → ...Array/basics/stringarr_basics_cs_d.csproj b/...ical/MDArray/basics/stringarr_cs_d.csproj → ...Array/basics/stringarr_basics_cs_d.csproj
diff --git a/...cal/MDArray/basics/stringarr_cs_do.csproj → ...rray/basics/stringarr_basics_cs_do.csproj b/...cal/MDArray/basics/stringarr_cs_do.csproj → ...rray/basics/stringarr_basics_cs_do.csproj
diff --git a/...ical/MDArray/basics/stringarr_cs_r.csproj → ...Array/basics/stringarr_basics_cs_r.csproj b/...ical/MDArray/basics/stringarr_cs_r.csproj → ...Array/basics/stringarr_basics_cs_r.csproj
diff --git a/...cal/MDArray/basics/stringarr_cs_ro.csproj → ...rray/basics/stringarr_basics_cs_ro.csproj b/...cal/MDArray/basics/stringarr_cs_ro.csproj → ...rray/basics/stringarr_basics_cs_ro.csproj
diff --git a/...ical/MDArray/basics/structarr_cs_d.csproj → ...Array/basics/structarr_basics_cs_d.csproj b/...ical/MDArray/basics/structarr_cs_d.csproj → ...Array/basics/structarr_basics_cs_d.csproj
diff --git a/...cal/MDArray/basics/structarr_cs_do.csproj → ...rray/basics/structarr_basics_cs_do.csproj b/...cal/MDArray/basics/structarr_cs_do.csproj → ...rray/basics/structarr_basics_cs_do.csproj
diff --git a/...ical/MDArray/basics/structarr_cs_r.csproj → ...Array/basics/structarr_basics_cs_r.csproj b/...ical/MDArray/basics/structarr_cs_r.csproj → ...Array/basics/structarr_basics_cs_r.csproj
diff --git a/...cal/MDArray/basics/structarr_cs_ro.csproj → ...rray/basics/structarr_basics_cs_ro.csproj b/...cal/MDArray/basics/structarr_cs_ro.csproj → ...rray/basics/structarr_basics_cs_ro.csproj
diff --git a/...tests/JIT/Methodical/VT/port/lcs_d.csproj → .../JIT/Methodical/VT/port/lcs_port_d.csproj b/...tests/JIT/Methodical/VT/port/lcs_d.csproj → .../JIT/Methodical/VT/port/lcs_port_d.csproj
diff --git a/...ests/JIT/Methodical/VT/port/lcs_do.csproj → ...JIT/Methodical/VT/port/lcs_port_do.csproj b/...ests/JIT/Methodical/VT/port/lcs_do.csproj → ...JIT/Methodical/VT/port/lcs_port_do.csproj
diff --git a/...tests/JIT/Methodical/VT/port/lcs_r.csproj → .../JIT/Methodical/VT/port/lcs_port_r.csproj b/...tests/JIT/Methodical/VT/port/lcs_r.csproj → .../JIT/Methodical/VT/port/lcs_port_r.csproj
diff --git a/...ests/JIT/Methodical/VT/port/lcs_ro.csproj → ...JIT/Methodical/VT/port/lcs_port_ro.csproj b/...ests/JIT/Methodical/VT/port/lcs_ro.csproj → ...JIT/Methodical/VT/port/lcs_port_ro.csproj
diff --git a/src/tests/JIT/Methodical/casts/SEH/filter.il b/src/tests/JIT/Methodical/casts/SEH/filter.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'filter' { }
+.assembly 'filter_SEH_casts' { }
 .method public static int32 main() cil managed
 {
 	.maxstack  8

diff --git a/...T/Methodical/casts/SEH/filter_il_d.ilproj → ...al/casts/SEH/filter_SEH_casts_il_d.ilproj b/...T/Methodical/casts/SEH/filter_il_d.ilproj → ...al/casts/SEH/filter_SEH_casts_il_d.ilproj
diff --git a/...T/Methodical/casts/SEH/filter_il_r.ilproj → ...al/casts/SEH/filter_SEH_casts_il_r.ilproj b/...T/Methodical/casts/SEH/filter_il_r.ilproj → ...al/casts/SEH/filter_SEH_casts_il_r.ilproj
diff --git a/...ical/cctor/misc/Desktop/throw_cs_d.csproj → ...or/misc/Desktop/throw_Desktop_cs_d.csproj b/...ical/cctor/misc/Desktop/throw_cs_d.csproj → ...or/misc/Desktop/throw_Desktop_cs_d.csproj
diff --git a/...cal/cctor/misc/Desktop/throw_cs_do.csproj → ...r/misc/Desktop/throw_Desktop_cs_do.csproj b/...cal/cctor/misc/Desktop/throw_cs_do.csproj → ...r/misc/Desktop/throw_Desktop_cs_do.csproj
diff --git a/...ical/cctor/misc/Desktop/throw_cs_r.csproj → ...or/misc/Desktop/throw_Desktop_cs_r.csproj b/...ical/cctor/misc/Desktop/throw_cs_r.csproj → ...or/misc/Desktop/throw_Desktop_cs_r.csproj
diff --git a/...cal/cctor/misc/Desktop/throw_cs_ro.csproj → ...r/misc/Desktop/throw_Desktop_cs_ro.csproj b/...cal/cctor/misc/Desktop/throw_cs_ro.csproj → ...r/misc/Desktop/throw_Desktop_cs_ro.csproj
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
@@ -10,6 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
@@ -10,6 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
@@ -10,6 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
@@ -10,6 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="assemname.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/.../JIT/Methodical/cctor/misc/testlib.csproj → ...Methodical/cctor/misc/testlib_misc.csproj b/.../JIT/Methodical/cctor/misc/testlib.csproj → ...Methodical/cctor/misc/testlib_misc.csproj
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
@@ -10,6 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads1.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_d.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_do.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
@@ -12,6 +12,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_r.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="threads2.cs" />
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_misc.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...T/Methodical/cctor/misc/throw_cs_d.csproj → ...hodical/cctor/misc/throw_misc_cs_d.csproj b/...T/Methodical/cctor/misc/throw_cs_d.csproj → ...hodical/cctor/misc/throw_misc_cs_d.csproj
diff --git a/.../Methodical/cctor/misc/throw_cs_do.csproj → ...odical/cctor/misc/throw_misc_cs_do.csproj b/.../Methodical/cctor/misc/throw_cs_do.csproj → ...odical/cctor/misc/throw_misc_cs_do.csproj
diff --git a/...T/Methodical/cctor/misc/throw_cs_r.csproj → ...hodical/cctor/misc/throw_misc_cs_r.csproj b/...T/Methodical/cctor/misc/throw_cs_r.csproj → ...hodical/cctor/misc/throw_misc_cs_r.csproj
diff --git a/.../Methodical/cctor/misc/throw_cs_ro.csproj → ...odical/cctor/misc/throw_misc_cs_ro.csproj b/.../Methodical/cctor/misc/throw_cs_ro.csproj → ...odical/cctor/misc/throw_misc_cs_ro.csproj
diff --git a/...IT/Methodical/cctor/xassem/testlib.csproj → ...odical/cctor/xassem/testlib_xassem.csproj b/...IT/Methodical/cctor/xassem/testlib.csproj → ...odical/cctor/xassem/testlib_xassem.csproj
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise1b.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj b/src/tests/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
@@ -12,6 +12,6 @@
     <Compile Include="xprecise4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="testlib.csproj" />
+    <ProjectReference Include="testlib_xassem.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ethodical/eh/basics/throwincatch_d.csproj → ...al/eh/basics/throwincatch_basics_d.csproj b/...ethodical/eh/basics/throwincatch_d.csproj → ...al/eh/basics/throwincatch_basics_d.csproj
diff --git a/...thodical/eh/basics/throwincatch_do.csproj → ...l/eh/basics/throwincatch_basics_do.csproj b/...thodical/eh/basics/throwincatch_do.csproj → ...l/eh/basics/throwincatch_basics_do.csproj
diff --git a/...ethodical/eh/basics/throwincatch_r.csproj → ...al/eh/basics/throwincatch_basics_r.csproj b/...ethodical/eh/basics/throwincatch_r.csproj → ...al/eh/basics/throwincatch_basics_r.csproj
diff --git a/...thodical/eh/basics/throwincatch_ro.csproj → ...l/eh/basics/throwincatch_basics_ro.csproj b/...thodical/eh/basics/throwincatch_ro.csproj → ...l/eh/basics/throwincatch_basics_ro.csproj
diff --git a/...hodical/eh/basics/throwinfinally_d.csproj → .../eh/basics/throwinfinally_basics_d.csproj b/...hodical/eh/basics/throwinfinally_d.csproj → .../eh/basics/throwinfinally_basics_d.csproj
diff --git a/...odical/eh/basics/throwinfinally_do.csproj → ...eh/basics/throwinfinally_basics_do.csproj b/...odical/eh/basics/throwinfinally_do.csproj → ...eh/basics/throwinfinally_basics_do.csproj
diff --git a/...hodical/eh/basics/throwinfinally_r.csproj → .../eh/basics/throwinfinally_basics_r.csproj b/...hodical/eh/basics/throwinfinally_r.csproj → .../eh/basics/throwinfinally_basics_r.csproj
diff --git a/...odical/eh/basics/throwinfinally_ro.csproj → ...eh/basics/throwinfinally_basics_ro.csproj b/...odical/eh/basics/throwinfinally_ro.csproj → ...eh/basics/throwinfinally_basics_ro.csproj
diff --git a/...hodical/eh/generics/throwincatch_d.csproj → ...h/generics/throwincatch_generics_d.csproj b/...hodical/eh/generics/throwincatch_d.csproj → ...h/generics/throwincatch_generics_d.csproj
diff --git a/...odical/eh/generics/throwincatch_do.csproj → .../generics/throwincatch_generics_do.csproj b/...odical/eh/generics/throwincatch_do.csproj → .../generics/throwincatch_generics_do.csproj
diff --git a/...hodical/eh/generics/throwincatch_r.csproj → ...h/generics/throwincatch_generics_r.csproj b/...hodical/eh/generics/throwincatch_r.csproj → ...h/generics/throwincatch_generics_r.csproj
diff --git a/...odical/eh/generics/throwincatch_ro.csproj → .../generics/throwincatch_generics_ro.csproj b/...odical/eh/generics/throwincatch_ro.csproj → .../generics/throwincatch_generics_ro.csproj
diff --git a/...eh/nested/general/throwinfinally_d.csproj → ...d/general/throwinfinally_general_d.csproj b/...eh/nested/general/throwinfinally_d.csproj → ...d/general/throwinfinally_general_d.csproj
diff --git a/...h/nested/general/throwinfinally_do.csproj → .../general/throwinfinally_general_do.csproj b/...h/nested/general/throwinfinally_do.csproj → .../general/throwinfinally_general_do.csproj
diff --git a/...eh/nested/general/throwinfinally_r.csproj → ...d/general/throwinfinally_general_r.csproj b/...eh/nested/general/throwinfinally_r.csproj → ...d/general/throwinfinally_general_r.csproj
diff --git a/...h/nested/general/throwinfinally_ro.csproj → .../general/throwinfinally_general_ro.csproj b/...h/nested/general/throwinfinally_ro.csproj → .../general/throwinfinally_general_ro.csproj
diff --git a/...T/Methodical/inlining/boolean/test.csproj → ...ical/inlining/boolean/test_boolean.csproj b/...T/Methodical/inlining/boolean/test.csproj → ...ical/inlining/boolean/test_boolean.csproj
diff --git a/...Methodical/inlining/bug505642/test.csproj → .../inlining/bug505642/test_bug505642.csproj b/...Methodical/inlining/bug505642/test.csproj → .../inlining/bug505642/test_bug505642.csproj
diff --git 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
+.assembly tailcall_nonvirtualcall
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004

diff --git a/...dical/nonvirtualcall/tailcall_il_d.ilproj → ...lcall/tailcall_nonvirtualcall_il_d.ilproj b/...dical/nonvirtualcall/tailcall_il_d.ilproj → ...lcall/tailcall_nonvirtualcall_il_d.ilproj
diff --git a/...dical/nonvirtualcall/tailcall_il_r.ilproj → ...lcall/tailcall_nonvirtualcall_il_r.ilproj b/...dical/nonvirtualcall/tailcall_il_r.ilproj → ...lcall/tailcall_nonvirtualcall_il_r.ilproj
diff --git 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' {
+.assembly 'localloc_operand' {
 }
 .assembly extern xunit.core {}
 .namespace JitTest

diff --git a/...odical/xxobj/operand/localloc_il_d.ilproj → ...xobj/operand/localloc_operand_il_d.ilproj b/...odical/xxobj/operand/localloc_il_d.ilproj → ...xobj/operand/localloc_operand_il_d.ilproj
diff --git a/...odical/xxobj/operand/localloc_il_r.ilproj → ...xobj/operand/localloc_operand_il_r.ilproj b/...odical/xxobj/operand/localloc_il_r.ilproj → ...xobj/operand/localloc_operand_il_r.ilproj
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
@@ -1326,10 +1326,10 @@
 
         <!-- Catch(T) in shared code -->
         <!-- https://github.com/dotnet/runtimelab/issues/204 -->
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_d\*" />
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_do\*" />
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_r\*" />
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_ro\*" />
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_generics_d\*" />
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_generics_do\*" />
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_generics_r\*" />
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\throwincatch_generics_ro\*" />
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\trycatchnestedtype_d\*" />
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\trycatchnestedtype_do\*" />
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical\eh\generics\trycatchnestedtype_r\*" />
@@ -2531,13 +2531,13 @@
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Boxing/boxunbox/tailcall_il_r/**">
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r/**">
             <Issue>https://github.com/dotnet/runtime/issues/54388</Issue>
         </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Coverage/b39946/**">
             <Issue>https://github.com/dotnet/runtime/issues/54388</Issue>
         </ExcludeList>
-        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Boxing/boxunbox/tailcall_il_d/**">
+        <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d/**">
             <Issue>needs triage</Issue>
         </ExcludeList>
         <ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/eh/finallyexec/loopinfinally_r/**">