diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.cs index 31963466c17c6..e5cf294307600 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj index 636c4989a288b..e47cd6e4687e3 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.cs index 637d0ed53c4c6..91ed01eaed920 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -58,7 +59,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance_Jagged.csproj similarity index 90% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance_Jagged.csproj index bfbba123ebef6..f98b8d6be0f1c 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.cs index 85788ff980765..f676f583bad1b 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_ConstructedTypes_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_ConstructedTypes_Jagged.csproj index 673e3091338f6..bce7ba97d5fdd 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_ConstructedTypes_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.cs index dc1c7ac01a4ea..a3bfb8373d9f8 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -58,7 +59,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance_Jagged.csproj similarity index 90% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance_Jagged.csproj index 0b49db5d0bb66..22338db339f1d 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.cs index 27f64f530f481..9159b00f45831 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -58,7 +59,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static_Jagged.csproj index 990aacca73347..559391cc1fad1 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.cs index c1a9bbd8e3cee..eb0250a715086 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02_Jagged.csproj index 3c79ad90f7aad..f07d7bfb9d4a1 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.cs index 06a9e3d055c28..1389a0791f220 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03_Jagged.csproj index cb22372d15c5a..1b940357d2a55 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.cs index 8f44ed806fa77..6c3022789996e 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04_Jagged.csproj index 959713a7265c6..8ecfb8f0bbdda 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.cs index 1e770049dd874..44643e08d81d3 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05_Jagged.csproj index 7d5a751191855..4642818606af4 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.cs index 66ad0d4923795..8b67ae0d0892b 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj index c750c6e10c7e3..511cb0cb8ca33 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.cs index 6a9d180fa44fd..a0bf4ba26d354 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj index 3260fa9f7cbd4..44afd76778932 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.cs index 46e8eb90c43ce..c7ea0e432155f 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj index c0c48123b6586..04a858a95c553 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.cs index f357058bd4e61..77a258cf6db22 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -58,7 +59,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static_Jagged.csproj similarity index 90% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static_Jagged.csproj index c925d627d4d75..c2391096a9363 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.cs index 84ee003aa39a5..a296a73ae4126 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02_Jagged.csproj index c71ca870bf03d..95fc349bd8116 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.cs index aa915530139b2..835b65a6eaca2 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03_Jagged.csproj index a07be62ecb96c..5882d6a27c17e 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.cs index 16efa4e7699a3..fe21640984b7d 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04_Jagged.csproj index 23ed1fa18c96f..2eb77ddcbe6d4 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.cs index e3255a822d636..4722888d3a9bf 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -49,7 +50,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05_Jagged.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05_Jagged.csproj index afc280874ea9f..0748a514d98c3 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.cs index 304251cf1f870..7354d2893bb07 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj index de5498cfc7725..912cefdfc2317 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.cs index fa36cba23d25a..a9fe5f53f3ce1 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k, l, m; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj index a3dd5b565307f..570d6d43f4a7d 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.cs index bdcf7fafa42ba..8908c124437ee 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_ConstructedTypes_MultiDim.csproj similarity index 88% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_ConstructedTypes_MultiDim.csproj index a554844fab059..39ef8ced0e4c0 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_ConstructedTypes_MultiDim.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_Instance.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_Instance.cs index 0c9d73a6ab06d..e4a5a43dbb261 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_Instance.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_Instance.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -56,7 +57,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance_MultiDim.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance_MultiDim.csproj index f290f72392238..9ee6e25286aba 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance_MultiDim.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.cs index 010379d4376bb..9b7241e67d6a3 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -56,7 +57,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static_MultiDim.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static_MultiDim.csproj index d232c3b087f02..fcbe45b67f0df 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static_MultiDim.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.cs index c1f0a7e819b15..2aaf308bd84d8 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k; diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_ConstructedTypes.csproj similarity index 88% rename from src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_ConstructedTypes.csproj index 44e6004bf7885..8a9b025d4f010 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_ConstructedTypes.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_Instance.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_Instance.cs index 38d79f596ebf4..be16fc8b0906d 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_Instance.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_Instance.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -56,7 +57,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance_MultiDim.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance_MultiDim.csproj index bc646f2b27280..d72155a5aa571 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance_MultiDim.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.cs b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.cs index a4d8e3d80aa7c..ec9219bd45614 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.cs +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -56,7 +57,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int size = 10; int i, j, k; diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static_MultiDim.csproj similarity index 89% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj rename to src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static_MultiDim.csproj index af69a36df513c..09684f26c1bdb 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj +++ b/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static_MultiDim.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.cs b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.cs index f320b436760c2..0211c3ad1e78f 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.cs +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -94,7 +95,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int i = 0; diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01_TypeParameters_Jagged.csproj similarity index 72% rename from src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj rename to src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01_TypeParameters_Jagged.csproj index 8ebf0dc5b0553..56f8d0fcafc07 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/class01_TypeParameters_Jagged.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.cs b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.cs index cea8381f308d2..58db8048e1ee4 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.cs +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -94,7 +95,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int i = 0; diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01_Jagged.csproj similarity index 88% rename from src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj rename to src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01_Jagged.csproj index 44e6004bf7885..8a9b025d4f010 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/Jagged/struct01_Jagged.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.cs b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.cs index 75c081299bc8f..e6168ad743707 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.cs +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -93,7 +94,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int i = 0; diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01_TypeParameters_MultiDim.csproj similarity index 88% rename from src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj rename to src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01_TypeParameters_MultiDim.csproj index a554844fab059..39ef8ced0e4c0 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/class01_TypeParameters_MultiDim.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.cs b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.cs index 82fc97fae6bd7..146f74ad97607 100644 --- a/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.cs +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX1 @@ -93,7 +94,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int i = 0; diff --git a/src/tests/JIT/Generics/Typeof/struct01.csproj b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01_struct01.csproj.csproj similarity index 88% rename from src/tests/JIT/Generics/Typeof/struct01.csproj rename to src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01_struct01.csproj.csproj index 44e6004bf7885..8a9b025d4f010 100644 --- a/src/tests/JIT/Generics/Typeof/struct01.csproj +++ b/src/tests/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01_struct01.csproj.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1.cs b/src/tests/JIT/Generics/ConstrainedCall/class1.cs index 5ff51628d0ab6..e7bc746d2ae46 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1.cs +++ b/src/tests/JIT/Generics/ConstrainedCall/class1.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IncrDecr { void Incr(int a); @@ -56,9 +57,10 @@ public int Val(int index) return counters[index].Val(); } } -class test +public class test { - public static int Main() + [Fact] + public static int TestEntryPoint() { MyCounter mc = new MyCounter(); mc.Increment(); diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1.il b/src/tests/JIT/Generics/ConstrainedCall/class1.il index 35ce0a76762dc..9dc893e0d58f8 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1.il +++ b/src/tests/JIT/Generics/ConstrainedCall/class1.il @@ -9,7 +9,7 @@ } .assembly extern xunit.core {} .assembly extern mscorlib {} -.assembly class1 {} +.assembly ASSEMBLY_NAME {} .class interface private abstract auto ansi IncrDecr { .method public hidebysig newslot abstract virtual @@ -241,7 +241,7 @@ } -.class private auto ansi beforefieldinit test +.class public auto ansi beforefieldinit test extends [mscorlib]System.Object { .method public hidebysig static int32 Main() cil managed diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_d.csproj b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_d.csproj index a0d51d52cf994..625af83d6cd2a 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_d.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_do.csproj b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_do.csproj index 70632fd721787..4101b1dd079ee 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_do.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_r.csproj b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_r.csproj index 38b466e794268..b435903724311 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_r.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj index def27b675bbf6..86afab267f17f 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_d.il b/src/tests/JIT/Generics/ConstrainedCall/class1_d.il new file mode 100644 index 0000000000000..594fb27325a20 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_d.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "class1_d" diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_il_d.ilproj b/src/tests/JIT/Generics/ConstrainedCall/class1_d.ilproj similarity index 87% rename from src/tests/JIT/Generics/ConstrainedCall/class1_il_d.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/class1_d.ilproj index 2e7738c3fca9f..da536700cf3fb 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1_il_d.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_d.ilproj @@ -1,12 +1,12 @@ - Exe 1 Full + diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_r.il b/src/tests/JIT/Generics/ConstrainedCall/class1_r.il new file mode 100644 index 0000000000000..f04e0e350fea0 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_r.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "class1_r" diff --git a/src/tests/JIT/Generics/ConstrainedCall/class1_il_r.ilproj b/src/tests/JIT/Generics/ConstrainedCall/class1_r.ilproj similarity index 88% rename from src/tests/JIT/Generics/ConstrainedCall/class1_il_r.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/class1_r.ilproj index 8cbb739b06512..03db7170f6db2 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class1_il_r.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class1_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 @@ -8,6 +7,7 @@ False + diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2.cs b/src/tests/JIT/Generics/ConstrainedCall/class2.cs index b5907396d3d68..6f76be9bcba55 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2.cs +++ b/src/tests/JIT/Generics/ConstrainedCall/class2.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IncrDecr { void Incr(int a); @@ -65,9 +66,10 @@ public int Val(int index) return counters[index].Val(); } } -class test +public class test { - public static int Main() + [Fact] + public static int TestEntryPoint() { MyCounter mc = new MyCounter(); mc.Increment(); diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2.il b/src/tests/JIT/Generics/ConstrainedCall/class2.il index fea004ef58a01..2f72a1b3ac3a2 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2.il +++ b/src/tests/JIT/Generics/ConstrainedCall/class2.il @@ -9,7 +9,7 @@ } .assembly extern xunit.core {} .assembly extern mscorlib {} -.assembly class2 {} +.assembly ASSEMBLY_NAME {} .class interface private abstract auto ansi IncrDecr { .method public hidebysig newslot abstract virtual @@ -306,7 +306,7 @@ } -.class private auto ansi beforefieldinit test +.class public auto ansi beforefieldinit test extends [mscorlib]System.Object { .method public hidebysig static int32 Main() cil managed diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_d.csproj b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_d.csproj index 698a213887385..c543359593317 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_d.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_do.csproj b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_do.csproj index dfcf6fd166deb..2b1456b8a0c45 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_do.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_r.csproj b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_r.csproj index 2d68bb2f20060..d5a8bec8b344d 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_r.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj index 06f0b844038a6..e02dd6b4c2ec2 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_d.il b/src/tests/JIT/Generics/ConstrainedCall/class2_d.il new file mode 100644 index 0000000000000..47c2ed1e67036 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_d.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "class2_d" diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_il_d.ilproj b/src/tests/JIT/Generics/ConstrainedCall/class2_d.ilproj similarity index 87% rename from src/tests/JIT/Generics/ConstrainedCall/class2_il_d.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/class2_d.ilproj index 75f76fe0303a9..211e4651ca81c 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2_il_d.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_d.ilproj @@ -1,12 +1,12 @@ - Exe 1 Full + diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_r.il b/src/tests/JIT/Generics/ConstrainedCall/class2_r.il new file mode 100644 index 0000000000000..286c90b2cafa3 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_r.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "class2_r" diff --git a/src/tests/JIT/Generics/ConstrainedCall/class2_il_r.ilproj b/src/tests/JIT/Generics/ConstrainedCall/class2_r.ilproj similarity index 88% rename from src/tests/JIT/Generics/ConstrainedCall/class2_il_r.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/class2_r.ilproj index 84fc55f2ed1d6..6d4332e9f66e0 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/class2_il_r.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/class2_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 @@ -8,6 +7,7 @@ False + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1.cs b/src/tests/JIT/Generics/ConstrainedCall/vt1.cs index e7e76f6b353b0..e1ae242dbb5da 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1.cs +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IncrDecr { void Incr(int a); @@ -55,9 +56,10 @@ public int Val(int index) return counters[index].Val(); } } -class test +public class test { - public static int Main() + [Fact] + public static int TestEntryPoint() { MyCounter mc = new MyCounter(); mc.Increment(); diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1.il b/src/tests/JIT/Generics/ConstrainedCall/vt1.il index b580283536404..5997e387d7ccd 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1.il +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1.il @@ -12,7 +12,7 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly vt1 {} +.assembly ASSEMBLY_NAME {} .class interface private abstract auto ansi IncrDecr { .method public hidebysig newslot abstract virtual @@ -228,7 +228,7 @@ } // end of class MyCounter -.class private auto ansi beforefieldinit test +.class public auto ansi beforefieldinit test extends [mscorlib]System.Object { .method public hidebysig static int32 Main() cil managed diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj index b47f076f58342..c9bc819860c16 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj index bcc034eb40b53..017fe3d1f067d 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj index 6cacf6bca20ce..e73676e997a44 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj index 3a53aa0d17079..e3341e0818bab 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_d.il b/src/tests/JIT/Generics/ConstrainedCall/vt1_d.il new file mode 100644 index 0000000000000..ba89723cdefc3 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_d.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt1_d" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt1_d.ilproj similarity index 88% rename from src/tests/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt1_d.ilproj index 1954b33eeed1f..ad17a869df1c4 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_d.ilproj @@ -1,12 +1,12 @@ - Exe 1 Full + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_r.il b/src/tests/JIT/Generics/ConstrainedCall/vt1_r.il new file mode 100644 index 0000000000000..77fc5ed6a52a4 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_r.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt1_r" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt1_r.ilproj similarity index 89% rename from src/tests/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt1_r.ilproj index 9567db4f46238..d7f3c9deb71ff 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt1_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 @@ -8,6 +7,7 @@ False + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2.cs b/src/tests/JIT/Generics/ConstrainedCall/vt2.cs index 0636f5a479e6d..548efa00e85ed 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2.cs +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IncrDecr { int Val(); @@ -43,9 +44,10 @@ public int Val3B(T cnter) return counter.GetHashCode(); } } -class test +public class test { - public static int Main() + [Fact] + public static int TestEntryPoint() { MyCounter mc = new MyCounter(); if (mc.Val1A() != mc.Val1B()) diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2.il b/src/tests/JIT/Generics/ConstrainedCall/vt2.il index f537653f1d7c1..3112e200bad73 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2.il +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2.il @@ -12,7 +12,7 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly vt2 {} +.assembly ASSEMBLY_NAME {} .class interface private abstract auto ansi IncrDecr { .method public hidebysig newslot abstract virtual @@ -180,7 +180,7 @@ } // end of class MyCounter -.class private auto ansi beforefieldinit test +.class public auto ansi beforefieldinit test extends [mscorlib]System.Object { .method public hidebysig static int32 Main() cil managed diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj index 92f6b3d1f913f..c6207907ed912 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj @@ -1,7 +1,4 @@ - - Exe - Full False diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj index c3509d45f21f4..970f3cea8b07d 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj @@ -1,7 +1,4 @@ - - Exe - Full True diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj index ca79a9c7ef74f..df30fbf7a734c 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj @@ -1,7 +1,4 @@ - - Exe - None False diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj index 53fceae62a987..9eb06581fbe48 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj @@ -1,7 +1,4 @@ - - Exe - None True diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_d.il b/src/tests/JIT/Generics/ConstrainedCall/vt2_d.il new file mode 100644 index 0000000000000..eb320a79e6f5e --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_d.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt2_d" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt2_d.ilproj similarity index 71% rename from src/tests/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt2_d.ilproj index aeea167c65174..56088803c5ca2 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_d.ilproj @@ -1,11 +1,9 @@ - - Exe - Full + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_r.il b/src/tests/JIT/Generics/ConstrainedCall/vt2_r.il new file mode 100644 index 0000000000000..0c0e2efea7f1c --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_r.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt2_r" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt2_r.ilproj similarity index 75% rename from src/tests/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt2_r.ilproj index 3631b83539661..3ec7646984a15 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt2_r.ilproj @@ -1,12 +1,10 @@ - - Exe - PdbOnly False + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3.cs b/src/tests/JIT/Generics/ConstrainedCall/vt3.cs index 42294e826e6ba..5d10a52314566 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3.cs +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IncrDecr { int Val(); @@ -44,9 +45,10 @@ public int Val3B(T cnter) return counter.GetHashCode(); } } -class test +public class test { - public static int Main() + [Fact] + public static int TestEntryPoint() { MyCounter mc = new MyCounter(); if (mc.Val1A() != mc.Val1B()) diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3.il b/src/tests/JIT/Generics/ConstrainedCall/vt3.il index 007f1f17ba45c..6f471e6e64dc7 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3.il +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3.il @@ -12,7 +12,7 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) .ver 4:0:0:0 } -.assembly vt3 {} +.assembly ASSEMBLY_NAME {} .class interface private abstract auto ansi IncrDecr { .method public hidebysig newslot abstract virtual @@ -197,7 +197,7 @@ } // end of class MyCounter -.class private auto ansi beforefieldinit test +.class public auto ansi beforefieldinit test extends [mscorlib]System.Object { .method public hidebysig static int32 Main() cil managed diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj index 55def775129dd..eb11061b6fd7f 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj index b4180f7e9769c..23f4930016252 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj index 62c70029b12a8..0bb903a788b5b 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj index 07ea07758b7c1..76f8f3d613d56 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_d.il b/src/tests/JIT/Generics/ConstrainedCall/vt3_d.il new file mode 100644 index 0000000000000..f302513f33ac2 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_d.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt3_d" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt3_d.ilproj similarity index 88% rename from src/tests/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt3_d.ilproj index d15a7cef306ab..32c71eee3d29a 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_d.ilproj @@ -1,12 +1,12 @@ - Exe 1 Full + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_r.il b/src/tests/JIT/Generics/ConstrainedCall/vt3_r.il new file mode 100644 index 0000000000000..99899a8c18eff --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_r.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt3_r" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt3_r.ilproj similarity index 89% rename from src/tests/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt3_r.ilproj index 6a97b97440372..f1135b4482028 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt3_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 @@ -8,6 +7,7 @@ False + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4.cs b/src/tests/JIT/Generics/ConstrainedCall/vt4.cs index 56d1f250ea1cb..08c18ecd251d1 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4.cs +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IncrDecr { void Incr(int a); @@ -65,9 +66,10 @@ public int Val(int index) return counters[index].Val(); } } -class test +public class test { - public static int Main() + [Fact] + public static int TestEntryPoint() { MyCounter mc = new MyCounter(); mc.Increment(); diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4.il b/src/tests/JIT/Generics/ConstrainedCall/vt4.il index 73b5be192103f..a86edb2b15919 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4.il +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4.il @@ -8,7 +8,7 @@ } .assembly extern xunit.core {} .assembly extern mscorlib {} -.assembly vt4 {} +.assembly ASSEMBLY_NAME {} .class interface private abstract auto ansi IncrDecr { .method public hidebysig newslot abstract virtual @@ -296,7 +296,7 @@ } -.class private auto ansi beforefieldinit test +.class public auto ansi beforefieldinit test extends [mscorlib]System.Object { .method public hidebysig static int32 Main() cil managed diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj index 002b874f468bf..678cda534ed4c 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj index 278b5f948ed31..906dd5adc6381 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj index af154c14831f6..c984a9719ea13 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj index 076d27491aeaf..98e1dad221a89 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_d.il b/src/tests/JIT/Generics/ConstrainedCall/vt4_d.il new file mode 100644 index 0000000000000..89de327fb4289 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_d.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt4_d" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt4_d.ilproj similarity index 88% rename from src/tests/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt4_d.ilproj index 6af1ca13f91bc..1b11ac38f354d 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_d.ilproj @@ -1,12 +1,12 @@ - Exe 1 Full + diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_r.il b/src/tests/JIT/Generics/ConstrainedCall/vt4_r.il new file mode 100644 index 0000000000000..1bfa9cb07bba0 --- /dev/null +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_r.il @@ -0,0 +1 @@ +#define ASSEMBLY_NAME "vt4_r" diff --git a/src/tests/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj b/src/tests/JIT/Generics/ConstrainedCall/vt4_r.ilproj similarity index 89% rename from src/tests/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj rename to src/tests/JIT/Generics/ConstrainedCall/vt4_r.ilproj index 64009d2d1ca8d..de006d737416a 100644 --- a/src/tests/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj +++ b/src/tests/JIT/Generics/ConstrainedCall/vt4_r.ilproj @@ -1,6 +1,5 @@ - Exe 1 @@ -8,6 +7,7 @@ False + diff --git a/src/tests/JIT/Generics/Constraints/Call_instance01.cs b/src/tests/JIT/Generics/Constraints/Call_instance01.cs index c2cace096d4b2..32f975b5bdbc3 100644 --- a/src/tests/JIT/Generics/Constraints/Call_instance01.cs +++ b/src/tests/JIT/Generics/Constraints/Call_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public interface IFoo { @@ -60,7 +61,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new GenClass().CallOnConstraint(new FooClass())); Eval(new GenClass().CallOnConstraint(new FooStruct())); diff --git a/src/tests/JIT/Generics/Constraints/Call_instance01_d.csproj b/src/tests/JIT/Generics/Constraints/Call_instance01_d.csproj index 89970469235a6..0e81e841a6be7 100644 --- a/src/tests/JIT/Generics/Constraints/Call_instance01_d.csproj +++ b/src/tests/JIT/Generics/Constraints/Call_instance01_d.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/Call_instance01_do.csproj b/src/tests/JIT/Generics/Constraints/Call_instance01_do.csproj index af54c74be03dd..70f09eac305ff 100644 --- a/src/tests/JIT/Generics/Constraints/Call_instance01_do.csproj +++ b/src/tests/JIT/Generics/Constraints/Call_instance01_do.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/Call_instance01_r.csproj b/src/tests/JIT/Generics/Constraints/Call_instance01_r.csproj index 218e9883401e3..9816743a83821 100644 --- a/src/tests/JIT/Generics/Constraints/Call_instance01_r.csproj +++ b/src/tests/JIT/Generics/Constraints/Call_instance01_r.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/Call_instance01_ro.csproj b/src/tests/JIT/Generics/Constraints/Call_instance01_ro.csproj index 8a0461f13525e..c0a2e1f042ce9 100644 --- a/src/tests/JIT/Generics/Constraints/Call_instance01_ro.csproj +++ b/src/tests/JIT/Generics/Constraints/Call_instance01_ro.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/Call_static01.cs b/src/tests/JIT/Generics/Constraints/Call_static01.cs index c2a567b22ce5a..6ea800b16c291 100644 --- a/src/tests/JIT/Generics/Constraints/Call_static01.cs +++ b/src/tests/JIT/Generics/Constraints/Call_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public interface IFoo { @@ -55,7 +56,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(GenClass.CallOnConstraint(new FooClass())); Eval(GenClass.CallOnConstraint(new FooStruct())); diff --git a/src/tests/JIT/Generics/Constraints/Convert_instance01.cs b/src/tests/JIT/Generics/Constraints/Convert_instance01.cs index 6c43bb6a5514d..b7eefca855105 100644 --- a/src/tests/JIT/Generics/Constraints/Convert_instance01.cs +++ b/src/tests/JIT/Generics/Constraints/Convert_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public interface IFoo { @@ -54,7 +55,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new GenClass().ConvertToConstraint(new FooClass()).GetType().Equals(typeof(FooClass))); Eval(new GenClass().ConvertToConstraint(new FooStruct()).GetType().Equals(typeof(FooStruct))); diff --git a/src/tests/JIT/Generics/Constraints/Convert_static01.cs b/src/tests/JIT/Generics/Constraints/Convert_static01.cs index 26eaea8ea39c4..392323526efcd 100644 --- a/src/tests/JIT/Generics/Constraints/Convert_static01.cs +++ b/src/tests/JIT/Generics/Constraints/Convert_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public interface IFoo { @@ -49,7 +50,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(GenClass.ConvertToConstraint(new FooClass()).GetType().Equals(typeof(FooClass))); Eval(GenClass.ConvertToConstraint(new FooStruct()).GetType().Equals(typeof(FooStruct))); diff --git a/src/tests/JIT/Generics/Constraints/Transitive_instance01.cs b/src/tests/JIT/Generics/Constraints/Transitive_instance01.cs index 157dcf8f27c8d..ca48b9b120a90 100644 --- a/src/tests/JIT/Generics/Constraints/Transitive_instance01.cs +++ b/src/tests/JIT/Generics/Constraints/Transitive_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public interface IFoo { } @@ -47,7 +48,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new GenClass().TransitiveConstraint().GetType().Equals(typeof(Transition))); Eval(new GenClass().TransitiveConstraint().GetType().Equals(typeof(Transition))); diff --git a/src/tests/JIT/Generics/Constraints/Transitive_static01.cs b/src/tests/JIT/Generics/Constraints/Transitive_static01.cs index f9327e3707717..cfeed7faaba64 100644 --- a/src/tests/JIT/Generics/Constraints/Transitive_static01.cs +++ b/src/tests/JIT/Generics/Constraints/Transitive_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public interface IFoo { } @@ -42,7 +43,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(GenClass.TransitiveConstraint().GetType().Equals(typeof(Transition))); Eval(GenClass.TransitiveConstraint().GetType().Equals(typeof(Transition))); diff --git a/src/tests/JIT/Generics/Constraints/call_instance01.csproj b/src/tests/JIT/Generics/Constraints/call_instance01.csproj index ca87447420be2..bc4bc34a303a9 100644 --- a/src/tests/JIT/Generics/Constraints/call_instance01.csproj +++ b/src/tests/JIT/Generics/Constraints/call_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/call_static01.csproj b/src/tests/JIT/Generics/Constraints/call_static01.csproj index b6f4d55b55833..e5671028d3422 100644 --- a/src/tests/JIT/Generics/Constraints/call_static01.csproj +++ b/src/tests/JIT/Generics/Constraints/call_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/convert_instance01.csproj b/src/tests/JIT/Generics/Constraints/convert_instance01.csproj index 0ae6da1e99af3..74de5da88c720 100644 --- a/src/tests/JIT/Generics/Constraints/convert_instance01.csproj +++ b/src/tests/JIT/Generics/Constraints/convert_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/convert_static01.csproj b/src/tests/JIT/Generics/Constraints/convert_static01.csproj index 010c5798ba50b..10827f782860d 100644 --- a/src/tests/JIT/Generics/Constraints/convert_static01.csproj +++ b/src/tests/JIT/Generics/Constraints/convert_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/transitive_instance01.csproj b/src/tests/JIT/Generics/Constraints/transitive_instance01.csproj index 00465294a358c..d52fafe3e995c 100644 --- a/src/tests/JIT/Generics/Constraints/transitive_instance01.csproj +++ b/src/tests/JIT/Generics/Constraints/transitive_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Constraints/transitive_static01.csproj b/src/tests/JIT/Generics/Constraints/transitive_static01.csproj index 0e4546649db60..59f4b3e756921 100644 --- a/src/tests/JIT/Generics/Constraints/transitive_static01.csproj +++ b/src/tests/JIT/Generics/Constraints/transitive_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.cs b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.cs index 448ef8a8df477..8df88c04db29c 100644 --- a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.cs +++ b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; public static class Tests { @@ -38,7 +39,8 @@ public static void Expect(this int actual, int expected, [CallerLineNumber] int } } - public static int Main() + [Fact] + public static int TestEntryPoint() { BoxIsInstBr1(1).Expect(1); BoxIsInstBr1(null).Expect(0); diff --git a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.csproj b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.csproj index 4fe878befb265..5996879b274d1 100644 --- a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.csproj +++ b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_br_nullable.csproj @@ -1,6 +1,5 @@ - Exe True diff --git a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.cs b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.cs index c1afad402d2e8..10063b049eb7a 100644 --- a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.cs +++ b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; +using Xunit; public static class Tests { @@ -39,7 +40,8 @@ public static void Expect(this int actual, int expected, [CallerLineNumber] int } } - public static int Main() + [Fact] + public static int TestEntryPoint() { BoxIsInstUnbox1(1).Expect(1); BoxIsInstUnbox1(1).Expect(-1); diff --git a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.csproj b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.csproj index 3b6e765928d5d..54fbd58740295 100644 --- a/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.csproj +++ b/src/tests/JIT/Generics/Conversions/Boxing/box_isinst_unbox.csproj @@ -1,6 +1,5 @@ - Exe None True diff --git a/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.cs b/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.cs index 2d0af4edb181a..78ca30262e303 100644 --- a/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.cs +++ b/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -51,7 +52,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().Unbox(new Gen().Box(1)).Equals(1)); Eval(new Gen().Unbox(new Gen().Box(1.111)).Equals(1.111)); diff --git a/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.csproj b/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.csproj index 1cea2f27547d4..48acf4e67f4bd 100644 --- a/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.csproj +++ b/src/tests/JIT/Generics/Conversions/Boxing/box_unbox01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Conversions/Reference/GenToGen01.cs b/src/tests/JIT/Generics/Conversions/Reference/GenToGen01.cs index edb64eabb68c7..63c97834bc8ad 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/GenToGen01.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/GenToGen01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -99,7 +100,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenOfT(new Gen(), false, typeof(Gen))); Eval(new Converter().ToGenBaseOfT(new Gen(), false, typeof(Gen))); diff --git a/src/tests/JIT/Generics/Conversions/Reference/GenToGen02.cs b/src/tests/JIT/Generics/Conversions/Reference/GenToGen02.cs index 80602c00d00fb..8a7e552eb017a 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/GenToGen02.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/GenToGen02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -96,7 +97,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenOfT(new Gen(), false, typeof(Gen))); Eval(new Converter().ToGenBaseOfT(new Gen(), false, typeof(Gen))); diff --git a/src/tests/JIT/Generics/Conversions/Reference/GenToGen03.cs b/src/tests/JIT/Generics/Conversions/Reference/GenToGen03.cs index adb42668302aa..4d4b7196db42d 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/GenToGen03.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/GenToGen03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -96,7 +97,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenOfT(new Gen(), false, typeof(Gen))); Eval(new Converter().ToGenBaseOfT(new Gen(), false, typeof(Gen))); diff --git a/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen01.cs b/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen01.cs index f5635e5fc98c8..c701ee164dabc 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen01.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -99,7 +100,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenBaseOfT(new Gen(), false, typeof(Gen))); Eval(new Converter().ToGenOfT(new GenBase(), true, null)); diff --git a/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen02.cs b/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen02.cs index 2c5c76a791a20..b5e465b9881f1 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen02.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -95,7 +96,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenBaseOfT(new Gen(), false, typeof(Gen))); diff --git a/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen03.cs b/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen03.cs index a6fedf2f6e7c3..0edcd0513735d 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen03.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/GenToNonGen03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -95,7 +96,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenBaseOfT(new Gen(), false, typeof(Gen))); diff --git a/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen01.cs b/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen01.cs index 6549ff6915488..d657f8dec3d1e 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen01.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -128,7 +129,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenBaseOfT(new GenInt(), false, typeof(GenInt))); Eval(new Converter().ToGenInt(new GenInt(), false, typeof(GenInt))); diff --git a/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen02.cs b/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen02.cs index 7a845f0855529..6a6a0ea5b2ebf 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen02.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -124,7 +125,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenBaseOfT(new GenInt(), false, typeof(GenInt))); Eval(new Converter().ToGenBaseOfT(new GenInt(), true, null)); diff --git a/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen03.cs b/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen03.cs index ac0e9f3a21b61..58b880808ffe5 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen03.cs +++ b/src/tests/JIT/Generics/Conversions/Reference/NonGenToGen03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -124,7 +125,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Converter().ToGenBaseOfT(new GenInt(), false, typeof(GenInt))); Eval(new Converter().ToGenBaseOfT(new GenInt(), true, null)); diff --git a/src/tests/JIT/Generics/Conversions/Reference/gentogen01.csproj b/src/tests/JIT/Generics/Conversions/Reference/gentogen01.csproj index 2431f05b92273..bace697145a7f 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/gentogen01.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/gentogen01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Conversions/Reference/gentogen02.csproj b/src/tests/JIT/Generics/Conversions/Reference/gentogen02.csproj index 20fd9f7c41047..736b7f71de560 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/gentogen02.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/gentogen02.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Conversions/Reference/gentogen03.csproj b/src/tests/JIT/Generics/Conversions/Reference/gentogen03.csproj index 93868ce08c068..da37d923e3195 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/gentogen03.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/gentogen03.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Conversions/Reference/gentonongen01.csproj b/src/tests/JIT/Generics/Conversions/Reference/gentonongen01.csproj index 80a066afb5456..2819137302678 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/gentonongen01.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/gentonongen01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Conversions/Reference/gentonongen02.csproj b/src/tests/JIT/Generics/Conversions/Reference/gentonongen02.csproj index 27c45c254a8ff..d2f465f744d8a 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/gentonongen02.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/gentonongen02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Conversions/Reference/gentonongen03.csproj b/src/tests/JIT/Generics/Conversions/Reference/gentonongen03.csproj index b002a782c8680..de9c3db7c60d3 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/gentonongen03.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/gentonongen03.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Conversions/Reference/nongentogen01.csproj b/src/tests/JIT/Generics/Conversions/Reference/nongentogen01.csproj index bb4266e46bacb..714528fab3f25 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/nongentogen01.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/nongentogen01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Conversions/Reference/nongentogen02.csproj b/src/tests/JIT/Generics/Conversions/Reference/nongentogen02.csproj index 6ea11c71a6156..3d1f9e0d8d591 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/nongentogen02.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/nongentogen02.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Conversions/Reference/nongentogen03.csproj b/src/tests/JIT/Generics/Conversions/Reference/nongentogen03.csproj index a68ef855b2031..66d1c0007f184 100644 --- a/src/tests/JIT/Generics/Conversions/Reference/nongentogen03.csproj +++ b/src/tests/JIT/Generics/Conversions/Reference/nongentogen03.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Coverage/chaos55915408cs.cs b/src/tests/JIT/Generics/Coverage/chaos55915408cs.cs index f3498545ec5ad..e38dac2caa4a1 100644 --- a/src/tests/JIT/Generics/Coverage/chaos55915408cs.cs +++ b/src/tests/JIT/Generics/Coverage/chaos55915408cs.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // +using Xunit; /// Generic chaos types /// CommandLine: ///GenericChaos.exe /mtc:5 /mtcc:1 /mic:10 /ol:Cs /ol:Vb /mtpc:1 /mmtpc:1 @@ -314,7 +315,8 @@ public void CreateAllTypesA0A1() public class Program { - public static int Main() + [Fact] + public static int TestEntryPoint() { A0 v0 = new A0(); v0.CreateAllTypesA0(); diff --git a/src/tests/JIT/Generics/Coverage/chaos55915408cs.csproj b/src/tests/JIT/Generics/Coverage/chaos55915408cs.csproj index bf5952f6c9355..05114af53f4b4 100644 --- a/src/tests/JIT/Generics/Coverage/chaos55915408cs.csproj +++ b/src/tests/JIT/Generics/Coverage/chaos55915408cs.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Coverage/chaos55915408cs_o.csproj b/src/tests/JIT/Generics/Coverage/chaos55915408cs_o.csproj index e13fd9c3eea3a..217f17f6466d1 100644 --- a/src/tests/JIT/Generics/Coverage/chaos55915408cs_o.csproj +++ b/src/tests/JIT/Generics/Coverage/chaos55915408cs_o.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Generics/Coverage/chaos56200037cs.cs b/src/tests/JIT/Generics/Coverage/chaos56200037cs.cs index 3daf4d3443d26..63e4b4b0adcb8 100644 --- a/src/tests/JIT/Generics/Coverage/chaos56200037cs.cs +++ b/src/tests/JIT/Generics/Coverage/chaos56200037cs.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // +using Xunit; /// Generic chaos types /// CommandLine: ///GenericChaos.exe /mtc:10 /mtcc:10 /mic:5 /ol:Cs /ol:Vb @@ -1472,7 +1473,8 @@ public interface IA1A2 : IA2 public class Program { - public static int Main() + [Fact] + public static int TestEntryPoint() { A0 v0 = new A0(); v0.CreateAllTypesA0(); diff --git a/src/tests/JIT/Generics/Coverage/chaos56200037cs.csproj b/src/tests/JIT/Generics/Coverage/chaos56200037cs.csproj index c7835c3a48224..39508c40ee916 100644 --- a/src/tests/JIT/Generics/Coverage/chaos56200037cs.csproj +++ b/src/tests/JIT/Generics/Coverage/chaos56200037cs.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Coverage/chaos56200037cs_o.csproj b/src/tests/JIT/Generics/Coverage/chaos56200037cs_o.csproj index 2357804cd19da..a6cf44f8597c7 100644 --- a/src/tests/JIT/Generics/Coverage/chaos56200037cs_o.csproj +++ b/src/tests/JIT/Generics/Coverage/chaos56200037cs_o.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly True diff --git a/src/tests/JIT/Generics/Coverage/chaos65204782cs.cs b/src/tests/JIT/Generics/Coverage/chaos65204782cs.cs index 90c60d24e0260..579bbc6a80216 100644 --- a/src/tests/JIT/Generics/Coverage/chaos65204782cs.cs +++ b/src/tests/JIT/Generics/Coverage/chaos65204782cs.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // +using Xunit; /// Generic chaos types /// CommandLine: ///GenericChaos.exe /mtc:10 /mtcc:2 /mic:10 /ol:Cs /ol:Vb /mtpc:2 /mmtpc:2 @@ -3451,7 +3452,8 @@ public void CreateAllTypesA0A1() public class Program { - public static int Main() + [Fact] + public static int TestEntryPoint() { A0 v0 = new A0(); v0.CreateAllTypesA0(); diff --git a/src/tests/JIT/Generics/Coverage/chaos65204782cs.csproj b/src/tests/JIT/Generics/Coverage/chaos65204782cs.csproj index 70523ca8d454c..0ffa0c0cc07f7 100644 --- a/src/tests/JIT/Generics/Coverage/chaos65204782cs.csproj +++ b/src/tests/JIT/Generics/Coverage/chaos65204782cs.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Coverage/chaos65204782cs_o.csproj b/src/tests/JIT/Generics/Coverage/chaos65204782cs_o.csproj index 6bbbba551b235..4951bb1a81e5e 100644 --- a/src/tests/JIT/Generics/Coverage/chaos65204782cs_o.csproj +++ b/src/tests/JIT/Generics/Coverage/chaos65204782cs_o.csproj @@ -1,6 +1,7 @@ - Exe + + true true 1 diff --git a/src/tests/JIT/Generics/Directory.Build.props b/src/tests/JIT/Generics/Directory.Build.props new file mode 100644 index 0000000000000..d500cf42b33e1 --- /dev/null +++ b/src/tests/JIT/Generics/Directory.Build.props @@ -0,0 +1,11 @@ + + + + + + + true + $(NoWarn);xUnit1013 + false + + diff --git a/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.il b/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.il index 33aa5426827e9..daf8eeaae1692 100644 --- a/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.il +++ b/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.il @@ -1,9 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -.assembly extern System.Runtime {} +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } +.assembly extern xunit.core {} .assembly extern System.Console {} -.assembly GenericCatchInterface {} +.assembly GenericCatchInterfaceProgram {} // IL in this file is based on this C# program with a few IL modifications: @@ -61,14 +62,17 @@ // class MyException : Exception, IMyInterface {} -.class private abstract auto ansi sealed beforefieldinit GenericCatchInterfaceProgram +.class public abstract auto ansi sealed beforefieldinit GenericCatchInterfaceProgram extends [System.Runtime]System.Object { // .field private static int32 retCode - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { + .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( + 01 00 00 00 + ) .entrypoint .maxstack 2 IL_0000: newobj instance void MyException::.ctor() diff --git a/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.ilproj b/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.ilproj index 1f01486f84882..43b0118fc8ee5 100644 --- a/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.ilproj +++ b/src/tests/JIT/Generics/Exceptions/GenericCatchInterfaceProgram.ilproj @@ -1,6 +1,5 @@ - Exe True diff --git a/src/tests/JIT/Generics/Exceptions/general_class_instance01.cs b/src/tests/JIT/Generics/Exceptions/general_class_instance01.cs index 1fe0b7fc9a176..aded275dc2fea 100644 --- a/src/tests/JIT/Generics/Exceptions/general_class_instance01.cs +++ b/src/tests/JIT/Generics/Exceptions/general_class_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -79,7 +80,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().ExceptionTest(true)); Eval(new Gen().ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/general_class_instance01.csproj b/src/tests/JIT/Generics/Exceptions/general_class_instance01.csproj index 70044ffe65e03..5dfc1cecf88bb 100644 --- a/src/tests/JIT/Generics/Exceptions/general_class_instance01.csproj +++ b/src/tests/JIT/Generics/Exceptions/general_class_instance01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Exceptions/general_class_static01.cs b/src/tests/JIT/Generics/Exceptions/general_class_static01.cs index be4484311a90c..6fb9fe1376833 100644 --- a/src/tests/JIT/Generics/Exceptions/general_class_static01.cs +++ b/src/tests/JIT/Generics/Exceptions/general_class_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -79,7 +80,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(Gen.ExceptionTest(true)); Eval(Gen.ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/general_class_static01.csproj b/src/tests/JIT/Generics/Exceptions/general_class_static01.csproj index f8b548bfc86d3..1b0d17840dc1d 100644 --- a/src/tests/JIT/Generics/Exceptions/general_class_static01.csproj +++ b/src/tests/JIT/Generics/Exceptions/general_class_static01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Exceptions/general_struct_instance01.cs b/src/tests/JIT/Generics/Exceptions/general_struct_instance01.cs index 39d3d32fce1d0..81e82b9e51c70 100644 --- a/src/tests/JIT/Generics/Exceptions/general_struct_instance01.cs +++ b/src/tests/JIT/Generics/Exceptions/general_struct_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -79,7 +80,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().ExceptionTest(true)); Eval(new Gen().ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/general_struct_instance01.csproj b/src/tests/JIT/Generics/Exceptions/general_struct_instance01.csproj index 4884947ad772d..ae69dea9dc1b5 100644 --- a/src/tests/JIT/Generics/Exceptions/general_struct_instance01.csproj +++ b/src/tests/JIT/Generics/Exceptions/general_struct_instance01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Exceptions/general_struct_static01.cs b/src/tests/JIT/Generics/Exceptions/general_struct_static01.cs index f3e4462a2b873..6d5e2c420a16f 100644 --- a/src/tests/JIT/Generics/Exceptions/general_struct_static01.cs +++ b/src/tests/JIT/Generics/Exceptions/general_struct_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -79,7 +80,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(Gen.ExceptionTest(true)); Eval(Gen.ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/general_struct_static01.csproj b/src/tests/JIT/Generics/Exceptions/general_struct_static01.csproj index 2ac9b8cc8ecaf..454e87b58101b 100644 --- a/src/tests/JIT/Generics/Exceptions/general_struct_static01.csproj +++ b/src/tests/JIT/Generics/Exceptions/general_struct_static01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_instance01.cs b/src/tests/JIT/Generics/Exceptions/specific_class_instance01.cs index 4e204f68e709e..997de6e349e17 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_instance01.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_class_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -66,7 +67,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().ExceptionTest(true)); Eval(new Gen().ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_instance01.csproj b/src/tests/JIT/Generics/Exceptions/specific_class_instance01.csproj index 0eb1672aca888..87d6b79816134 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_instance01.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_class_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_instance02.cs b/src/tests/JIT/Generics/Exceptions/specific_class_instance02.cs index 5feb4c5b001e3..8b376c452d6e9 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_instance02.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_class_instance02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -53,7 +54,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int cLabel = 0; diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_instance02.csproj b/src/tests/JIT/Generics/Exceptions/specific_class_instance02.csproj index 8a37820371332..2db9bf81d7cea 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_instance02.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_class_instance02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_static01.cs b/src/tests/JIT/Generics/Exceptions/specific_class_static01.cs index fa3a434a8e784..6b6475c57486b 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_static01.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_class_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -66,7 +67,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(Gen.ExceptionTest(true)); Eval(Gen.ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_static01.csproj b/src/tests/JIT/Generics/Exceptions/specific_class_static01.csproj index 057de8a28609d..17323d4b2b769 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_static01.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_class_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_static02.cs b/src/tests/JIT/Generics/Exceptions/specific_class_static02.cs index ccf7c02f7e466..60d3d2e12eca1 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_static02.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_class_static02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -53,7 +54,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int cLabel = 0; diff --git a/src/tests/JIT/Generics/Exceptions/specific_class_static02.csproj b/src/tests/JIT/Generics/Exceptions/specific_class_static02.csproj index df014b5ff57db..c0e5341940cbb 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_class_static02.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_class_static02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.cs b/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.cs index 91214150a4a5a..88f1371f4dd90 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -66,7 +67,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().ExceptionTest(true)); Eval(new Gen().ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.csproj b/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.csproj index a5b5b7ee05ae8..193932e18ec32 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.cs b/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.cs index 13c5424fd7c60..521902a0c029d 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -53,7 +54,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int cLabel = 0; diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.csproj b/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.csproj index 81eef5a1fb6a0..0ec7d39abebd3 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_instance02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_static01.cs b/src/tests/JIT/Generics/Exceptions/specific_struct_static01.cs index 827667c61e47c..9e9ba09aed0bf 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_static01.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -66,7 +67,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(Gen.ExceptionTest(true)); Eval(Gen.ExceptionTest(true)); diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_static01.csproj b/src/tests/JIT/Generics/Exceptions/specific_struct_static01.csproj index 745d3bf9a1c02..f1c9241254fe8 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_static01.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_static02.cs b/src/tests/JIT/Generics/Exceptions/specific_struct_static02.cs index d6643f8972b8a..436b32b3790c5 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_static02.cs +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_static02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -53,7 +54,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int cLabel = 0; diff --git a/src/tests/JIT/Generics/Exceptions/specific_struct_static02.csproj b/src/tests/JIT/Generics/Exceptions/specific_struct_static02.csproj index 4fe75c8f84da4..6cca5aac937ea 100644 --- a/src/tests/JIT/Generics/Exceptions/specific_struct_static02.csproj +++ b/src/tests/JIT/Generics/Exceptions/specific_struct_static02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/getclassfrommethodparam.cs b/src/tests/JIT/Generics/Fields/getclassfrommethodparam.cs index ba58df0b38c76..f1dd9aa66d161 100644 --- a/src/tests/JIT/Generics/Fields/getclassfrommethodparam.cs +++ b/src/tests/JIT/Generics/Fields/getclassfrommethodparam.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.CompilerServices; +using Xunit; namespace Sandbox3 { @@ -20,9 +21,10 @@ public static void Action(T value) public class Dummy { } - internal class Program + public class Program { - private static int Main() + [Fact] + public static int TestEntryPoint() { string s = "hello"; diff --git a/src/tests/JIT/Generics/Fields/getclassfrommethodparam.csproj b/src/tests/JIT/Generics/Fields/getclassfrommethodparam.csproj index e287e38eb3a8b..c82afdca25bee 100644 --- a/src/tests/JIT/Generics/Fields/getclassfrommethodparam.csproj +++ b/src/tests/JIT/Generics/Fields/getclassfrommethodparam.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Generics/Fields/instance_assignment_class01.cs b/src/tests/JIT/Generics/Fields/instance_assignment_class01.cs index 75be79c3e3cbd..dd56c6cc7d2c4 100644 --- a/src/tests/JIT/Generics/Fields/instance_assignment_class01.cs +++ b/src/tests/JIT/Generics/Fields/instance_assignment_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Locals/instance_assignment_class01.csproj b/src/tests/JIT/Generics/Fields/instance_assignment_class01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/instance_assignment_class01.csproj rename to src/tests/JIT/Generics/Fields/instance_assignment_class01_Fields.csproj index b9d5f0f25e587..cdd43ff2f47c0 100644 --- a/src/tests/JIT/Generics/Locals/instance_assignment_class01.csproj +++ b/src/tests/JIT/Generics/Fields/instance_assignment_class01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/instance_assignment_struct01.cs b/src/tests/JIT/Generics/Fields/instance_assignment_struct01.cs index ec68b0d596125..fcd876888900e 100644 --- a/src/tests/JIT/Generics/Fields/instance_assignment_struct01.cs +++ b/src/tests/JIT/Generics/Fields/instance_assignment_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Locals/instance_assignment_struct01.csproj b/src/tests/JIT/Generics/Fields/instance_assignment_struct01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/instance_assignment_struct01.csproj rename to src/tests/JIT/Generics/Fields/instance_assignment_struct01_Fields.csproj index f6f33e5d00cc6..25af507ee7244 100644 --- a/src/tests/JIT/Generics/Locals/instance_assignment_struct01.csproj +++ b/src/tests/JIT/Generics/Fields/instance_assignment_struct01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/instance_equalnull_class01.cs b/src/tests/JIT/Generics/Fields/instance_equalnull_class01.cs index 7d2cf3c56b282..37646e7fd0b81 100644 --- a/src/tests/JIT/Generics/Fields/instance_equalnull_class01.cs +++ b/src/tests/JIT/Generics/Fields/instance_equalnull_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Locals/instance_equalnull_class01.csproj b/src/tests/JIT/Generics/Fields/instance_equalnull_class01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/instance_equalnull_class01.csproj rename to src/tests/JIT/Generics/Fields/instance_equalnull_class01_Fields.csproj index 34e871c3dab24..6112bfa3b8076 100644 --- a/src/tests/JIT/Generics/Locals/instance_equalnull_class01.csproj +++ b/src/tests/JIT/Generics/Fields/instance_equalnull_class01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/instance_equalnull_struct01.cs b/src/tests/JIT/Generics/Fields/instance_equalnull_struct01.cs index 5fa17e44ca6cf..75d49c6073a6c 100644 --- a/src/tests/JIT/Generics/Fields/instance_equalnull_struct01.cs +++ b/src/tests/JIT/Generics/Fields/instance_equalnull_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Locals/instance_equalnull_struct01.csproj b/src/tests/JIT/Generics/Fields/instance_equalnull_struct01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/instance_equalnull_struct01.csproj rename to src/tests/JIT/Generics/Fields/instance_equalnull_struct01_Fields.csproj index 73977a3a4eb9f..a839aef17fcf5 100644 --- a/src/tests/JIT/Generics/Locals/instance_equalnull_struct01.csproj +++ b/src/tests/JIT/Generics/Fields/instance_equalnull_struct01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/instance_passing_class01.cs b/src/tests/JIT/Generics/Fields/instance_passing_class01.cs index 32ed5a5065bd4..fecd11c51fa98 100644 --- a/src/tests/JIT/Generics/Fields/instance_passing_class01.cs +++ b/src/tests/JIT/Generics/Fields/instance_passing_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -74,7 +75,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Locals/instance_passing_class01.csproj b/src/tests/JIT/Generics/Fields/instance_passing_class01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/instance_passing_class01.csproj rename to src/tests/JIT/Generics/Fields/instance_passing_class01_Fields.csproj index 2ae4c9983e2c0..fa8917b259c53 100644 --- a/src/tests/JIT/Generics/Locals/instance_passing_class01.csproj +++ b/src/tests/JIT/Generics/Fields/instance_passing_class01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/instance_passing_struct01.cs b/src/tests/JIT/Generics/Fields/instance_passing_struct01.cs index 7cd769c8b6985..13041bf54bc16 100644 --- a/src/tests/JIT/Generics/Fields/instance_passing_struct01.cs +++ b/src/tests/JIT/Generics/Fields/instance_passing_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -74,7 +75,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Locals/instance_passing_struct01.csproj b/src/tests/JIT/Generics/Fields/instance_passing_struct01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/instance_passing_struct01.csproj rename to src/tests/JIT/Generics/Fields/instance_passing_struct01_Fields.csproj index 26877b500a96c..b693e0e7075ef 100644 --- a/src/tests/JIT/Generics/Locals/instance_passing_struct01.csproj +++ b/src/tests/JIT/Generics/Fields/instance_passing_struct01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/static_assignment_class01.cs b/src/tests/JIT/Generics/Fields/static_assignment_class01.cs index 375581f70180d..fa674d263e015 100644 --- a/src/tests/JIT/Generics/Fields/static_assignment_class01.cs +++ b/src/tests/JIT/Generics/Fields/static_assignment_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Locals/static_assignment_class01.csproj b/src/tests/JIT/Generics/Fields/static_assignment_class01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/static_assignment_class01.csproj rename to src/tests/JIT/Generics/Fields/static_assignment_class01_Fields.csproj index 8e494627c55d8..b67a0be90e41b 100644 --- a/src/tests/JIT/Generics/Locals/static_assignment_class01.csproj +++ b/src/tests/JIT/Generics/Fields/static_assignment_class01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/static_assignment_struct01.cs b/src/tests/JIT/Generics/Fields/static_assignment_struct01.cs index 394146c850e61..7ee6f074c7f87 100644 --- a/src/tests/JIT/Generics/Fields/static_assignment_struct01.cs +++ b/src/tests/JIT/Generics/Fields/static_assignment_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Locals/static_assignment_struct01.csproj b/src/tests/JIT/Generics/Fields/static_assignment_struct01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/static_assignment_struct01.csproj rename to src/tests/JIT/Generics/Fields/static_assignment_struct01_Fields.csproj index 4348e4ac795a0..67ad3c3807d72 100644 --- a/src/tests/JIT/Generics/Locals/static_assignment_struct01.csproj +++ b/src/tests/JIT/Generics/Fields/static_assignment_struct01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/static_equalnull_class01.cs b/src/tests/JIT/Generics/Fields/static_equalnull_class01.cs index f99777b5a64d9..9bcbdb298dc5f 100644 --- a/src/tests/JIT/Generics/Fields/static_equalnull_class01.cs +++ b/src/tests/JIT/Generics/Fields/static_equalnull_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Locals/static_equalnull_class01.csproj b/src/tests/JIT/Generics/Fields/static_equalnull_class01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/static_equalnull_class01.csproj rename to src/tests/JIT/Generics/Fields/static_equalnull_class01_Fields.csproj index 30662e9692246..7339023b44fef 100644 --- a/src/tests/JIT/Generics/Locals/static_equalnull_class01.csproj +++ b/src/tests/JIT/Generics/Fields/static_equalnull_class01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/static_equalnull_struct01.cs b/src/tests/JIT/Generics/Fields/static_equalnull_struct01.cs index fd12a7263ddfe..42fb5ab79e2cc 100644 --- a/src/tests/JIT/Generics/Fields/static_equalnull_struct01.cs +++ b/src/tests/JIT/Generics/Fields/static_equalnull_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -48,7 +49,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Locals/static_equalnull_struct01.csproj b/src/tests/JIT/Generics/Fields/static_equalnull_struct01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/static_equalnull_struct01.csproj rename to src/tests/JIT/Generics/Fields/static_equalnull_struct01_Fields.csproj index 909bcaed7936e..43229fb4f4b50 100644 --- a/src/tests/JIT/Generics/Locals/static_equalnull_struct01.csproj +++ b/src/tests/JIT/Generics/Fields/static_equalnull_struct01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/static_passing_class01.cs b/src/tests/JIT/Generics/Fields/static_passing_class01.cs index 48e305665a2b6..c7a5aa90ac1be 100644 --- a/src/tests/JIT/Generics/Fields/static_passing_class01.cs +++ b/src/tests/JIT/Generics/Fields/static_passing_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -74,7 +75,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Locals/static_passing_class01.csproj b/src/tests/JIT/Generics/Fields/static_passing_class01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/static_passing_class01.csproj rename to src/tests/JIT/Generics/Fields/static_passing_class01_Fields.csproj index a83e76cc5d26e..8cfe5f50e2dd9 100644 --- a/src/tests/JIT/Generics/Locals/static_passing_class01.csproj +++ b/src/tests/JIT/Generics/Fields/static_passing_class01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Fields/static_passing_struct01.cs b/src/tests/JIT/Generics/Fields/static_passing_struct01.cs index 0bf5b64d001c5..bf44382e48cc3 100644 --- a/src/tests/JIT/Generics/Fields/static_passing_struct01.cs +++ b/src/tests/JIT/Generics/Fields/static_passing_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -74,7 +75,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Locals/static_passing_struct01.csproj b/src/tests/JIT/Generics/Fields/static_passing_struct01_Fields.csproj similarity index 89% rename from src/tests/JIT/Generics/Locals/static_passing_struct01.csproj rename to src/tests/JIT/Generics/Fields/static_passing_struct01_Fields.csproj index d57e12bde6068..6c0d0455a3cb4 100644 --- a/src/tests/JIT/Generics/Locals/static_passing_struct01.csproj +++ b/src/tests/JIT/Generics/Fields/static_passing_struct01_Fields.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/Classes/BaseClass01.cs b/src/tests/JIT/Generics/Instantiation/Classes/BaseClass01.cs index 620ae6d93ad65..058a62c71c758 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/BaseClass01.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/BaseClass01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -162,7 +163,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new GenInt().InstVerify()); Eval(new GenDouble().InstVerify()); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/BaseClass02.cs b/src/tests/JIT/Generics/Instantiation/Classes/BaseClass02.cs index 728f276b59b66..e164052f37925 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/BaseClass02.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/BaseClass02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -70,7 +71,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int())).InstVerify(typeof(int))); Eval((new Gen(new double())).InstVerify(typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/BaseClass03.cs b/src/tests/JIT/Generics/Instantiation/Classes/BaseClass03.cs index 939fc507709fc..5360e193b9109 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/BaseClass03.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/BaseClass03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -79,7 +80,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int())).InstVerify(typeof(int))); Eval((new Gen(new double())).InstVerify(typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/Baseclass04.cs b/src/tests/JIT/Generics/Instantiation/Classes/Baseclass04.cs index 090c18d16b058..eb56c1ad71cec 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/Baseclass04.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/Baseclass04.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -77,7 +78,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new int())).InstVerify(typeof(int), typeof(int))); Eval((new Gen(new int(), new double())).InstVerify(typeof(int), typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/Baseclass05.cs b/src/tests/JIT/Generics/Instantiation/Classes/Baseclass05.cs index 4abe5e75d04c0..c01be6dfc718c 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/Baseclass05.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/Baseclass05.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -85,7 +86,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new double(), new Guid())).InstVerify(typeof(int), typeof(double), typeof(Guid))); Eval((new Gen(new double(), new Guid(), "string")).InstVerify(typeof(double), typeof(Guid), typeof(string))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/baseclass01.csproj b/src/tests/JIT/Generics/Instantiation/Classes/baseclass01.csproj index a51cbab637e53..5714b7c90f2f0 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/baseclass01.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/baseclass01.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Classes/baseclass02.csproj b/src/tests/JIT/Generics/Instantiation/Classes/baseclass02.csproj index 7400ee8c5114a..d112d1cf4b21d 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/baseclass02.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/baseclass02.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Classes/baseclass03.csproj b/src/tests/JIT/Generics/Instantiation/Classes/baseclass03.csproj index 8d3622b1bd89c..81cd646c37fb1 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/baseclass03.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/baseclass03.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Classes/baseclass04.csproj b/src/tests/JIT/Generics/Instantiation/Classes/baseclass04.csproj index 80d67177cd11e..a47abeb689682 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/baseclass04.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/baseclass04.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/Classes/baseclass05.csproj b/src/tests/JIT/Generics/Instantiation/Classes/baseclass05.csproj index 8c2c8af601a62..1c7ed3b9622e4 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/baseclass05.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/baseclass05.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Classes/class01.cs b/src/tests/JIT/Generics/Instantiation/Classes/class01.cs index bef280e75d5cd..e8445c24fd08d 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/class01.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -60,7 +61,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int())).InstVerify(typeof(int))); Eval((new Gen(new double())).InstVerify(typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/class01.csproj b/src/tests/JIT/Generics/Instantiation/Classes/class01_Classes.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Classes/class01.csproj rename to src/tests/JIT/Generics/Instantiation/Classes/class01_Classes.csproj index 8ebf0dc5b0553..56f8d0fcafc07 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/class01.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/class01_Classes.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Classes/class02.cs b/src/tests/JIT/Generics/Instantiation/Classes/class02.cs index 4122308c10f62..e2fae5b303f29 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/class02.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/class02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new int())).InstVerify(typeof(int), typeof(int))); Eval((new Gen(new int(), new double())).InstVerify(typeof(int), typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/class02.csproj b/src/tests/JIT/Generics/Instantiation/Classes/class02_Classes.csproj similarity index 88% rename from src/tests/JIT/Generics/Instantiation/Classes/class02.csproj rename to src/tests/JIT/Generics/Instantiation/Classes/class02_Classes.csproj index 99cf72b379a18..208a04af6018b 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/class02.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/class02_Classes.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/Classes/class03.cs b/src/tests/JIT/Generics/Instantiation/Classes/class03.cs index 2828b6ada61a3..5d54c0fd9df32 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/class03.cs +++ b/src/tests/JIT/Generics/Instantiation/Classes/class03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -75,7 +76,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new double(), new Guid())).InstVerify(typeof(int), typeof(double), typeof(Guid))); Eval((new Gen(new double(), new Guid(), "string")).InstVerify(typeof(double), typeof(Guid), typeof(string))); diff --git a/src/tests/JIT/Generics/Instantiation/Classes/class03.csproj b/src/tests/JIT/Generics/Instantiation/Classes/class03_Classes.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Classes/class03.csproj rename to src/tests/JIT/Generics/Instantiation/Classes/class03_Classes.csproj index 242548b89d1c3..819dcb9282d12 100644 --- a/src/tests/JIT/Generics/Instantiation/Classes/class03.csproj +++ b/src/tests/JIT/Generics/Instantiation/Classes/class03_Classes.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Class01.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Class01.cs index d061f7dec64ac..8c1276c9f10a2 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Class01.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -284,7 +285,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new GenInt(); IGenInt._Init(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Class02.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Class02.cs index 383ef5be61146..ba30ece8703d1 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Class02.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Class02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -65,7 +66,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new Gen(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Class03.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Class03.cs index c6b9ec3d234d4..e9e693b4399c0 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Class03.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Class03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -67,7 +68,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new Gen(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Class04.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Class04.cs index a30e52201a7e4..1b187e3cf8029 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Class04.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Class04.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -284,7 +285,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new GenInt(); IGenInt._Init(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Class05.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Class05.cs index 60cd4edefd08f..1c2a9917fed24 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Class05.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Class05.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -295,7 +296,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new GenInt(); IGenInt._Init(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct01.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct01.cs index 027252f409204..f54401af69b20 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct01.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -284,7 +285,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new GenInt(); IGenInt._Init(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct02.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct02.cs index ddd647df06d78..c59c4a7750dce 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct02.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -65,7 +66,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new Gen(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct03.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct03.cs index 270659972ba5d..8017fa18deff8 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct03.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -67,7 +68,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new Gen(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct04.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct04.cs index 7dd8adc1b8af1..a10113b1ee5c0 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct04.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct04.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -284,7 +285,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new GenInt(); IGenInt._Init(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct05.cs b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct05.cs index 27ff5bc633a1f..42eda7d44c711 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/Struct05.cs +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/Struct05.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -295,7 +296,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { IGen IGenInt = new GenInt(); IGenInt._Init(new int()); diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/class01.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/class01_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/class01.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/class01_Interfaces.csproj index 4555f1bab76c4..987d38acd951d 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/class01.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/class01_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/class02.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/class02_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/class02.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/class02_Interfaces.csproj index 5f743505a01a8..1c2817e0c8454 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/class02.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/class02_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/class03.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/class03_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/class03.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/class03_Interfaces.csproj index 1c0886ab7ae0b..1f8264482fc1b 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/class03.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/class03_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/class04.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/class04_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/class04.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/class04_Interfaces.csproj index 0960ea65c5ed3..46700428543e2 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/class04.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/class04_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/class05.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/class05_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/class05.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/class05_Interfaces.csproj index 10141dda582cb..0a51b51a605fe 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/class05.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/class05_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/struct01.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/struct01_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/struct01.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/struct01_Interfaces.csproj index 24df0a14dae1b..e438b2a01b1a0 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/struct01.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/struct01_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/struct02.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/struct02_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/struct02.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/struct02_Interfaces.csproj index 5ef929738dac8..748d15833a662 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/struct02.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/struct02_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/struct03.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/struct03_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/struct03.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/struct03_Interfaces.csproj index d423f5a676a5a..eb4abedbefd5b 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/struct03.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/struct03_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/struct04.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/struct04_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/struct04.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/struct04_Interfaces.csproj index a74c59fbf7def..dd13445fb8353 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/struct04.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/struct04_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Interfaces/struct05.csproj b/src/tests/JIT/Generics/Instantiation/Interfaces/struct05_Interfaces.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Interfaces/struct05.csproj rename to src/tests/JIT/Generics/Instantiation/Interfaces/struct05_Interfaces.csproj index 7bcc669767d07..321482e2c7f28 100644 --- a/src/tests/JIT/Generics/Instantiation/Interfaces/struct05.csproj +++ b/src/tests/JIT/Generics/Instantiation/Interfaces/struct05_Interfaces.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Structs/struct01.cs b/src/tests/JIT/Generics/Instantiation/Structs/struct01.cs index 8c9679aea9158..b679ba3aa6d86 100644 --- a/src/tests/JIT/Generics/Instantiation/Structs/struct01.cs +++ b/src/tests/JIT/Generics/Instantiation/Structs/struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -59,7 +60,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int())).InstVerify(typeof(int))); Eval((new Gen(new double())).InstVerify(typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Structs/struct01.csproj b/src/tests/JIT/Generics/Instantiation/Structs/struct01_Structs.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Structs/struct01.csproj rename to src/tests/JIT/Generics/Instantiation/Structs/struct01_Structs.csproj index 4885c7b133c75..bb76bd881107e 100644 --- a/src/tests/JIT/Generics/Instantiation/Structs/struct01.csproj +++ b/src/tests/JIT/Generics/Instantiation/Structs/struct01_Structs.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/Structs/struct02.cs b/src/tests/JIT/Generics/Instantiation/Structs/struct02.cs index bbb05d6f90d5a..1e6c737192d01 100644 --- a/src/tests/JIT/Generics/Instantiation/Structs/struct02.cs +++ b/src/tests/JIT/Generics/Instantiation/Structs/struct02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new int())).InstVerify(typeof(int), typeof(int))); Eval((new Gen(new int(), new double())).InstVerify(typeof(int), typeof(double))); diff --git a/src/tests/JIT/Generics/Instantiation/Structs/struct02.csproj b/src/tests/JIT/Generics/Instantiation/Structs/struct02_Structs.csproj similarity index 88% rename from src/tests/JIT/Generics/Instantiation/Structs/struct02.csproj rename to src/tests/JIT/Generics/Instantiation/Structs/struct02_Structs.csproj index b514a33fc035b..b9e6efd799d31 100644 --- a/src/tests/JIT/Generics/Instantiation/Structs/struct02.csproj +++ b/src/tests/JIT/Generics/Instantiation/Structs/struct02_Structs.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/Structs/struct03.cs b/src/tests/JIT/Generics/Instantiation/Structs/struct03.cs index 2744b546f25f2..3dd37ec8ebfb5 100644 --- a/src/tests/JIT/Generics/Instantiation/Structs/struct03.cs +++ b/src/tests/JIT/Generics/Instantiation/Structs/struct03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -75,7 +76,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new double(), new Guid())).InstVerify(typeof(int), typeof(double), typeof(Guid))); Eval((new Gen(new double(), new Guid(), "string")).InstVerify(typeof(double), typeof(Guid), typeof(string))); diff --git a/src/tests/JIT/Generics/Instantiation/Structs/struct03.csproj b/src/tests/JIT/Generics/Instantiation/Structs/struct03_Structs.csproj similarity index 72% rename from src/tests/JIT/Generics/Instantiation/Structs/struct03.csproj rename to src/tests/JIT/Generics/Instantiation/Structs/struct03_Structs.csproj index 449210f9f87d2..08ea3e3119785 100644 --- a/src/tests/JIT/Generics/Instantiation/Structs/struct03.csproj +++ b/src/tests/JIT/Generics/Instantiation/Structs/struct03_Structs.csproj @@ -1,7 +1,4 @@ - - Exe - PdbOnly diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.cs index a4800301721da..a811334a9ee2b 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public int Function(int i, out int j) } } -internal class Test_Delegate001 +public class Test_Delegate001 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.csproj index 0c8c5209b8f0c..166837f204668 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate001.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.cs index 55969f27f0eaf..3df4ec518c94d 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public T Function(T i, out T j) } } -internal class Test_Delegate002 +public class Test_Delegate002 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.csproj index b8b7d1d99fdaf..ad1c3b298e9af 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate002.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.cs index 108ee051ba55c..28c61a25dfd87 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ virtual public int Function(int i, out int j) } } -internal class Test_Delegate003 +public class Test_Delegate003 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.csproj index 1b54a6e26fd8c..92ed909998d7d 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate003.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.cs index bc61411488918..396d9afd78320 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ virtual public T Function(T i, out T j) } } -internal class Test_Delegate004 +public class Test_Delegate004 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.csproj index 9ac73a64c972d..d238f11294c0f 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate004.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.cs index 3b6f66bda971d..f196c507fee7a 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public T Function(T i, out T j) } } -internal class Test_Delegate005 +public class Test_Delegate005 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.csproj index cc07296bead2a..e82580445e4f0 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate005.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.cs index 07951b1fe2c24..2aa66e4576110 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public T Function(U i, out U j) } } -internal class Test_Delegate006 +public class Test_Delegate006 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.csproj index 8bcaf03f8bd73..5b39b15e22871 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate006.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.cs index dc646d9514aa3..4f62d5cb1471e 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ virtual public T Function(T i, out T j) } } -internal class Test_Delegate007 +public class Test_Delegate007 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.csproj index a2888e7bb8452..309eb7546ec08 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate007.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.cs index af2b37ed3daa0..f67c732f707b8 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ virtual public T Function(U i, out U j) } } -internal class Test_Delegate008 +public class Test_Delegate008 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.csproj index 3d8ba4e3820b7..d0822eae38f44 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate008.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.cs index 3b00bb85f55be..fa9db73264bfc 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public int Function(int i, out int j) } } -internal class Test_Delegate009 +public class Test_Delegate009 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.csproj index 22ce391b01163..eb825fdd64fde 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate009.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.cs index a59b86e07b8c7..7cf2b2bdc1eb2 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public T Function(T i, out T j) } } -internal class Test_Delegate010 +public class Test_Delegate010 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.csproj index cffefaf0acfc7..111b61644230a 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate010.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.cs index 8a3caeb08f04c..1e5b9279420ff 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public T Function(T i, out T j) } } -internal class Test_Delegate011 +public class Test_Delegate011 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.csproj index 22807f6acb918..9fb93473aba44 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate011.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.cs index f810de24f28ca..bf1515d7277d7 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ public T Function(U i, out U j) } } -internal class Test_Delegate012 +public class Test_Delegate012 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; Foo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.csproj index 304e10f9bac6f..8422c2d2fb095 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate012.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.cs index 487266812c02b..3ea156f44b945 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public int Function(int i, out int j) } } -internal class Test_Delegate013 +public class Test_Delegate013 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.csproj index e372aa61d7e5c..7019dc6017337 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate013.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.cs index 4e7c365133ff6..237854ad64981 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public T Function(T i, out T j) } } -internal class Test_Delegate014 +public class Test_Delegate014 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.csproj index ef6cf0e6e88e7..eb1ba9e25d6d0 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate014.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.cs index 809eee618ee35..bcf59135978cb 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public int Function(int i, out int j) } } -internal class Test_Delegate015 +public class Test_Delegate015 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.csproj index db667def799ee..bc7266124d577 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate015.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.cs index 76b2bd5582913..e6ebcdebeacfb 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public T Function(T i, out T j) } } -internal class Test_Delegate016 +public class Test_Delegate016 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.csproj index 78433f7b3e44a..5719838922204 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate016.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.cs index ed2702bd3c8a9..ec1889b8f7be9 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public virtual int Function(int i, out int j) } } -internal class Test_Delegate017 +public class Test_Delegate017 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.csproj index 451eb9e23536c..837d2ab09c2ff 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate017.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.cs index 97afce70ccc51..7aa4889de8064 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public virtual T Function(T i, out T j) } } -internal class Test_Delegate018 +public class Test_Delegate018 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.csproj index b35a97af4af8b..8441434cdb2a0 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate018.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.cs index 5db70694afbe6..712cde136958b 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public U Function(U i, out U j) } } -internal class Test_Delegate019 +public class Test_Delegate019 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.csproj index 242628ebbc54f..b5de2c6a0f0cb 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate019.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.cs index 8689ea21e6e63..fa485a5a6ade2 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public T Function(U i, out U j) } } -internal class Test_Delegate020 +public class Test_Delegate020 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.csproj index 4a2ec361ff06e..d01e36e0b4888 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate020.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.cs index 7f4da723e0f69..b228149ffdd7c 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public U Function(U i, out U j) } } -internal class Test_Delegate021 +public class Test_Delegate021 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.csproj index 84a9549605788..d86046cf267e1 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate021.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.cs index dc01236dadc2f..7d5f5c94bd925 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public T Function(U i, out U j) } } -internal class Test_Delegate022 +public class Test_Delegate022 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.csproj index 64f24d628cb03..03ebcda88b809 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate022.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.cs index 5fbb9b7f47a84..2e3f30e370d23 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public virtual U Function(U i, out U j) } } -internal class Test_Delegate023 +public class Test_Delegate023 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.csproj index 32d1f41f39ff4..3ecc529c64127 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate023.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.cs index 2d5d7f463d8ac..61240d58c19f1 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -20,9 +21,10 @@ public virtual T Function(U i, out U j) } } -internal class Test_Delegate024 +public class Test_Delegate024 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; IFoo inst = new Foo(); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.csproj index ae12256a839ec..7e784a678faa6 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate024.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.cs index 7c1e02ee3cbf2..fee5ad678d962 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public int Function(int i, out int j) } } -internal class Test_Delegate025 +public class Test_Delegate025 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.csproj index 20bd466ac551b..b949716f55a39 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate025.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.cs index 40ad6f7ed5b17..cb2a6981fc9cc 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public T Function(T i, out T j) } } -internal class Test_Delegate026 +public class Test_Delegate026 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.csproj index 5e94ab1f4f467..2eed30abb82ff 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate026.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.cs index 399ee549d892a..ab7b8607a5373 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public T Function(T i, out T j) } } -internal class Test_Delegate027 +public class Test_Delegate027 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.csproj index 34ab06fcdcbf2..c27afb1f52035 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate027.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.cs index 6188065aad218..ff38222abb17e 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public T Function(U i, out U j) } } -internal class Test_Delegate028 +public class Test_Delegate028 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.csproj index f4c58b5720ff0..2684dd71b5c8f 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate028.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.cs index 3a4eea458973d..339f15d0701e6 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public int Function(int i, out int j) } } -internal class Test_Delegate029 +public class Test_Delegate029 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.csproj index 2270a2ee0124f..7d7a2248fb1c8 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate029.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.cs index 8849c19ea143d..a90d35c3796cd 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public T Function(T i, out T j) } } -internal class Test_Delegate030 +public class Test_Delegate030 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.csproj index 86c3e3be9f8a8..43eab4cb7be40 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate030.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.cs index 677d5c9ff3fbd..85d210de67528 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public T Function(T i, out T j) } } -internal class Test_Delegate031 +public class Test_Delegate031 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.csproj index ce62edcdb0892..301c08187fcd5 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate031.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.cs b/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.cs index b17eccfab8f0e..c1290cf2fa881 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.cs +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.cs @@ -3,6 +3,7 @@ using System; using System.Threading; +using Xunit; internal delegate T GenDelegate(T p1, out T p2); @@ -15,9 +16,10 @@ static public T Function(U i, out U j) } } -internal class Test_Delegate032 +public class Test_Delegate032 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int i, j; GenDelegate MyDelegate = new GenDelegate(Foo.Function); diff --git a/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.csproj b/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.csproj index 7b73541731026..ee786ec2a90e1 100644 --- a/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.csproj +++ b/src/tests/JIT/Generics/Instantiation/delegates/Delegate032.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/JIT.Generics.csproj b/src/tests/JIT/Generics/JIT.Generics.csproj new file mode 100644 index 0000000000000..f751282d127da --- /dev/null +++ b/src/tests/JIT/Generics/JIT.Generics.csproj @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/tests/JIT/Generics/Locals/instance_assignment_class01.cs b/src/tests/JIT/Generics/Locals/instance_assignment_class01.cs index 3075948d53a40..ccf17b14a72ea 100644 --- a/src/tests/JIT/Generics/Locals/instance_assignment_class01.cs +++ b/src/tests/JIT/Generics/Locals/instance_assignment_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Fields/instance_assignment_class01.csproj b/src/tests/JIT/Generics/Locals/instance_assignment_class01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/instance_assignment_class01.csproj rename to src/tests/JIT/Generics/Locals/instance_assignment_class01_Locals.csproj index b9d5f0f25e587..cdd43ff2f47c0 100644 --- a/src/tests/JIT/Generics/Fields/instance_assignment_class01.csproj +++ b/src/tests/JIT/Generics/Locals/instance_assignment_class01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/instance_assignment_struct01.cs b/src/tests/JIT/Generics/Locals/instance_assignment_struct01.cs index ae137aceb154b..2978512af797c 100644 --- a/src/tests/JIT/Generics/Locals/instance_assignment_struct01.cs +++ b/src/tests/JIT/Generics/Locals/instance_assignment_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Fields/instance_assignment_struct01.csproj b/src/tests/JIT/Generics/Locals/instance_assignment_struct01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/instance_assignment_struct01.csproj rename to src/tests/JIT/Generics/Locals/instance_assignment_struct01_Locals.csproj index f6f33e5d00cc6..25af507ee7244 100644 --- a/src/tests/JIT/Generics/Fields/instance_assignment_struct01.csproj +++ b/src/tests/JIT/Generics/Locals/instance_assignment_struct01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/instance_equalnull_class01.cs b/src/tests/JIT/Generics/Locals/instance_equalnull_class01.cs index 633659da10479..e73326d827f03 100644 --- a/src/tests/JIT/Generics/Locals/instance_equalnull_class01.cs +++ b/src/tests/JIT/Generics/Locals/instance_equalnull_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Fields/instance_equalnull_class01.csproj b/src/tests/JIT/Generics/Locals/instance_equalnull_class01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/instance_equalnull_class01.csproj rename to src/tests/JIT/Generics/Locals/instance_equalnull_class01_Locals.csproj index 34e871c3dab24..6112bfa3b8076 100644 --- a/src/tests/JIT/Generics/Fields/instance_equalnull_class01.csproj +++ b/src/tests/JIT/Generics/Locals/instance_equalnull_class01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/instance_equalnull_struct01.cs b/src/tests/JIT/Generics/Locals/instance_equalnull_struct01.cs index a0e96545432d9..4be9e5c9ff028 100644 --- a/src/tests/JIT/Generics/Locals/instance_equalnull_struct01.cs +++ b/src/tests/JIT/Generics/Locals/instance_equalnull_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Fields/instance_equalnull_struct01.csproj b/src/tests/JIT/Generics/Locals/instance_equalnull_struct01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/instance_equalnull_struct01.csproj rename to src/tests/JIT/Generics/Locals/instance_equalnull_struct01_Locals.csproj index 73977a3a4eb9f..a839aef17fcf5 100644 --- a/src/tests/JIT/Generics/Fields/instance_equalnull_struct01.csproj +++ b/src/tests/JIT/Generics/Locals/instance_equalnull_struct01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/instance_passing_class01.cs b/src/tests/JIT/Generics/Locals/instance_passing_class01.cs index d42e7943fc918..87ba1a0a7a0fe 100644 --- a/src/tests/JIT/Generics/Locals/instance_passing_class01.cs +++ b/src/tests/JIT/Generics/Locals/instance_passing_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -71,7 +72,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Fields/instance_passing_class01.csproj b/src/tests/JIT/Generics/Locals/instance_passing_class01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/instance_passing_class01.csproj rename to src/tests/JIT/Generics/Locals/instance_passing_class01_Locals.csproj index 2ae4c9983e2c0..fa8917b259c53 100644 --- a/src/tests/JIT/Generics/Fields/instance_passing_class01.csproj +++ b/src/tests/JIT/Generics/Locals/instance_passing_class01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/instance_passing_struct01.cs b/src/tests/JIT/Generics/Locals/instance_passing_struct01.cs index ced577de9265f..4a6b3dd5a84df 100644 --- a/src/tests/JIT/Generics/Locals/instance_passing_struct01.cs +++ b/src/tests/JIT/Generics/Locals/instance_passing_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -71,7 +72,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Fields/instance_passing_struct01.csproj b/src/tests/JIT/Generics/Locals/instance_passing_struct01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/instance_passing_struct01.csproj rename to src/tests/JIT/Generics/Locals/instance_passing_struct01_Locals.csproj index 26877b500a96c..b693e0e7075ef 100644 --- a/src/tests/JIT/Generics/Fields/instance_passing_struct01.csproj +++ b/src/tests/JIT/Generics/Locals/instance_passing_struct01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/static_assignment_class01.cs b/src/tests/JIT/Generics/Locals/static_assignment_class01.cs index d3f6964803e7f..0408113daa067 100644 --- a/src/tests/JIT/Generics/Locals/static_assignment_class01.cs +++ b/src/tests/JIT/Generics/Locals/static_assignment_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Fields/static_assignment_class01.csproj b/src/tests/JIT/Generics/Locals/static_assignment_class01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/static_assignment_class01.csproj rename to src/tests/JIT/Generics/Locals/static_assignment_class01_Locals.csproj index 8e494627c55d8..b67a0be90e41b 100644 --- a/src/tests/JIT/Generics/Fields/static_assignment_class01.csproj +++ b/src/tests/JIT/Generics/Locals/static_assignment_class01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/static_assignment_struct01.cs b/src/tests/JIT/Generics/Locals/static_assignment_struct01.cs index 103f5a03dc9e4..f8be46f5900e3 100644 --- a/src/tests/JIT/Generics/Locals/static_assignment_struct01.cs +++ b/src/tests/JIT/Generics/Locals/static_assignment_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 1; diff --git a/src/tests/JIT/Generics/Fields/static_assignment_struct01.csproj b/src/tests/JIT/Generics/Locals/static_assignment_struct01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/static_assignment_struct01.csproj rename to src/tests/JIT/Generics/Locals/static_assignment_struct01_Locals.csproj index 4348e4ac795a0..67ad3c3807d72 100644 --- a/src/tests/JIT/Generics/Fields/static_assignment_struct01.csproj +++ b/src/tests/JIT/Generics/Locals/static_assignment_struct01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/static_equalnull_class01.cs b/src/tests/JIT/Generics/Locals/static_equalnull_class01.cs index 86e648cb14295..cc3f80f156b18 100644 --- a/src/tests/JIT/Generics/Locals/static_equalnull_class01.cs +++ b/src/tests/JIT/Generics/Locals/static_equalnull_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Fields/static_equalnull_class01.csproj b/src/tests/JIT/Generics/Locals/static_equalnull_class01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/static_equalnull_class01.csproj rename to src/tests/JIT/Generics/Locals/static_equalnull_class01_Locals.csproj index 30662e9692246..7339023b44fef 100644 --- a/src/tests/JIT/Generics/Fields/static_equalnull_class01.csproj +++ b/src/tests/JIT/Generics/Locals/static_equalnull_class01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/static_equalnull_struct01.cs b/src/tests/JIT/Generics/Locals/static_equalnull_struct01.cs index 5a4928b900568..b91b57101818f 100644 --- a/src/tests/JIT/Generics/Locals/static_equalnull_struct01.cs +++ b/src/tests/JIT/Generics/Locals/static_equalnull_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -46,7 +47,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Fields/static_equalnull_struct01.csproj b/src/tests/JIT/Generics/Locals/static_equalnull_struct01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/static_equalnull_struct01.csproj rename to src/tests/JIT/Generics/Locals/static_equalnull_struct01_Locals.csproj index 909bcaed7936e..43229fb4f4b50 100644 --- a/src/tests/JIT/Generics/Fields/static_equalnull_struct01.csproj +++ b/src/tests/JIT/Generics/Locals/static_equalnull_struct01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/static_passing_class01.cs b/src/tests/JIT/Generics/Locals/static_passing_class01.cs index f8e20c7443d89..6d3b0090a34df 100644 --- a/src/tests/JIT/Generics/Locals/static_passing_class01.cs +++ b/src/tests/JIT/Generics/Locals/static_passing_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -71,7 +72,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Fields/static_passing_class01.csproj b/src/tests/JIT/Generics/Locals/static_passing_class01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/static_passing_class01.csproj rename to src/tests/JIT/Generics/Locals/static_passing_class01_Locals.csproj index a83e76cc5d26e..8cfe5f50e2dd9 100644 --- a/src/tests/JIT/Generics/Fields/static_passing_class01.csproj +++ b/src/tests/JIT/Generics/Locals/static_passing_class01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Locals/static_passing_struct01.cs b/src/tests/JIT/Generics/Locals/static_passing_struct01.cs index d782a6c014d59..5cfcf6b56ca30 100644 --- a/src/tests/JIT/Generics/Locals/static_passing_struct01.cs +++ b/src/tests/JIT/Generics/Locals/static_passing_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -71,7 +72,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Fields/static_passing_struct01.csproj b/src/tests/JIT/Generics/Locals/static_passing_struct01_Locals.csproj similarity index 89% rename from src/tests/JIT/Generics/Fields/static_passing_struct01.csproj rename to src/tests/JIT/Generics/Locals/static_passing_struct01_Locals.csproj index d57e12bde6068..6c0d0455a3cb4 100644 --- a/src/tests/JIT/Generics/Fields/static_passing_struct01.csproj +++ b/src/tests/JIT/Generics/Locals/static_passing_struct01_Locals.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/class_instance01.cs b/src/tests/JIT/Generics/MemberAccess/class_instance01.cs index d985549eb85e9..4d29969047f68 100644 --- a/src/tests/JIT/Generics/MemberAccess/class_instance01.cs +++ b/src/tests/JIT/Generics/MemberAccess/class_instance01.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // using System; +using Xunit; class Gen { @@ -35,7 +36,8 @@ public virtual T VMethod(T t) public class Test_class_instance01 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/class_instance01.csproj b/src/tests/JIT/Generics/MemberAccess/class_instance01.csproj index a2eb647999168..dfe3136dd8db0 100644 --- a/src/tests/JIT/Generics/MemberAccess/class_instance01.csproj +++ b/src/tests/JIT/Generics/MemberAccess/class_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/class_static01.cs b/src/tests/JIT/Generics/MemberAccess/class_static01.cs index af586c8154098..478a267177503 100644 --- a/src/tests/JIT/Generics/MemberAccess/class_static01.cs +++ b/src/tests/JIT/Generics/MemberAccess/class_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; class Gen { @@ -24,7 +25,8 @@ static public T Method(T t) public class Test_class_static01 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/class_static01.csproj b/src/tests/JIT/Generics/MemberAccess/class_static01.csproj index 07dde9b526ea0..cd2ae926a33d9 100644 --- a/src/tests/JIT/Generics/MemberAccess/class_static01.csproj +++ b/src/tests/JIT/Generics/MemberAccess/class_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/interface_class01.cs b/src/tests/JIT/Generics/MemberAccess/interface_class01.cs index 995710bdea91f..628f8b4928501 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_class01.cs +++ b/src/tests/JIT/Generics/MemberAccess/interface_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IGen { @@ -60,7 +61,8 @@ public virtual T VMethod(T t) public class Test_interface_class01 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/interface_class01.csproj b/src/tests/JIT/Generics/MemberAccess/interface_class01.csproj index 43c54d6c94ab4..4ecde9a1c0d50 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_class01.csproj +++ b/src/tests/JIT/Generics/MemberAccess/interface_class01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/interface_class02.cs b/src/tests/JIT/Generics/MemberAccess/interface_class02.cs index 34ca47b0dd81c..e3c950ddede88 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_class02.cs +++ b/src/tests/JIT/Generics/MemberAccess/interface_class02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IGen { @@ -95,7 +96,8 @@ public virtual string VMethod(string t) public class Test_interface_class02 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/interface_class02.csproj b/src/tests/JIT/Generics/MemberAccess/interface_class02.csproj index 3caf276e77ced..ed6d5c914fb83 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_class02.csproj +++ b/src/tests/JIT/Generics/MemberAccess/interface_class02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/interface_struct01.cs b/src/tests/JIT/Generics/MemberAccess/interface_struct01.cs index ed7a1107276e5..ab241ad520aea 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_struct01.cs +++ b/src/tests/JIT/Generics/MemberAccess/interface_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IGen { @@ -49,7 +50,8 @@ public T Method(T t) public class Test_interface_struct01 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/interface_struct01.csproj b/src/tests/JIT/Generics/MemberAccess/interface_struct01.csproj index 6139f17ffc99a..eb957776d7ea7 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_struct01.csproj +++ b/src/tests/JIT/Generics/MemberAccess/interface_struct01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/interface_struct02.cs b/src/tests/JIT/Generics/MemberAccess/interface_struct02.cs index abb929d359393..b73a766e923a2 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_struct02.cs +++ b/src/tests/JIT/Generics/MemberAccess/interface_struct02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; interface IGen { @@ -73,7 +74,8 @@ public string Method(string t) public class Test_interface_struct02 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/interface_struct02.csproj b/src/tests/JIT/Generics/MemberAccess/interface_struct02.csproj index 63eb294a4181c..a1891e047f08d 100644 --- a/src/tests/JIT/Generics/MemberAccess/interface_struct02.csproj +++ b/src/tests/JIT/Generics/MemberAccess/interface_struct02.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/struct_instance01.cs b/src/tests/JIT/Generics/MemberAccess/struct_instance01.cs index 928147231ef63..b57597a702b9c 100644 --- a/src/tests/JIT/Generics/MemberAccess/struct_instance01.cs +++ b/src/tests/JIT/Generics/MemberAccess/struct_instance01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; struct Gen { @@ -30,7 +31,8 @@ public T Method(T t) public class Test_struct_instance01 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/struct_instance01.csproj b/src/tests/JIT/Generics/MemberAccess/struct_instance01.csproj index 83e1501c4fb52..bb75382b17e51 100644 --- a/src/tests/JIT/Generics/MemberAccess/struct_instance01.csproj +++ b/src/tests/JIT/Generics/MemberAccess/struct_instance01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/MemberAccess/struct_static01.cs b/src/tests/JIT/Generics/MemberAccess/struct_static01.cs index 001231247c66f..56b38f4a8ccb3 100644 --- a/src/tests/JIT/Generics/MemberAccess/struct_static01.cs +++ b/src/tests/JIT/Generics/MemberAccess/struct_static01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; struct Gen { @@ -24,7 +25,8 @@ static public T Method(T t) public class Test_struct_static01 { - public static int Main() + [Fact] + public static int TestEntryPoint() { int ret = 100; diff --git a/src/tests/JIT/Generics/MemberAccess/struct_static01.csproj b/src/tests/JIT/Generics/MemberAccess/struct_static01.csproj index ebfbd26517479..35578687383eb 100644 --- a/src/tests/JIT/Generics/MemberAccess/struct_static01.csproj +++ b/src/tests/JIT/Generics/MemberAccess/struct_static01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/instance_assignment_class01.cs b/src/tests/JIT/Generics/Parameters/instance_assignment_class01.cs index 19b8f2b19141e..bd35962d246c4 100644 --- a/src/tests/JIT/Generics/Parameters/instance_assignment_class01.cs +++ b/src/tests/JIT/Generics/Parameters/instance_assignment_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -50,7 +51,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/instance_assignment_class01.csproj b/src/tests/JIT/Generics/Parameters/instance_assignment_class01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/instance_assignment_class01.csproj rename to src/tests/JIT/Generics/Parameters/instance_assignment_class01_Parameters.csproj index b9d5f0f25e587..cdd43ff2f47c0 100644 --- a/src/tests/JIT/Generics/Parameters/instance_assignment_class01.csproj +++ b/src/tests/JIT/Generics/Parameters/instance_assignment_class01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/instance_assignment_struct01.cs b/src/tests/JIT/Generics/Parameters/instance_assignment_struct01.cs index 52e7fe72b8a39..3c019d4fe5bcc 100644 --- a/src/tests/JIT/Generics/Parameters/instance_assignment_struct01.cs +++ b/src/tests/JIT/Generics/Parameters/instance_assignment_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -50,7 +51,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/instance_assignment_struct01.csproj b/src/tests/JIT/Generics/Parameters/instance_assignment_struct01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/instance_assignment_struct01.csproj rename to src/tests/JIT/Generics/Parameters/instance_assignment_struct01_Parameters.csproj index f6f33e5d00cc6..25af507ee7244 100644 --- a/src/tests/JIT/Generics/Parameters/instance_assignment_struct01.csproj +++ b/src/tests/JIT/Generics/Parameters/instance_assignment_struct01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/instance_equalnull_class01.cs b/src/tests/JIT/Generics/Parameters/instance_equalnull_class01.cs index 1533a91ef149f..c6f8aa255cac6 100644 --- a/src/tests/JIT/Generics/Parameters/instance_equalnull_class01.cs +++ b/src/tests/JIT/Generics/Parameters/instance_equalnull_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -45,7 +46,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Parameters/instance_equalnull_class01.csproj b/src/tests/JIT/Generics/Parameters/instance_equalnull_class01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/instance_equalnull_class01.csproj rename to src/tests/JIT/Generics/Parameters/instance_equalnull_class01_Parameters.csproj index 34e871c3dab24..6112bfa3b8076 100644 --- a/src/tests/JIT/Generics/Parameters/instance_equalnull_class01.csproj +++ b/src/tests/JIT/Generics/Parameters/instance_equalnull_class01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.cs b/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.cs index 836efd673e71a..14205e4f7855d 100644 --- a/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.cs +++ b/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -45,7 +46,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.csproj b/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.csproj rename to src/tests/JIT/Generics/Parameters/instance_equalnull_struct01_Parameters.csproj index 73977a3a4eb9f..a839aef17fcf5 100644 --- a/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01.csproj +++ b/src/tests/JIT/Generics/Parameters/instance_equalnull_struct01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/instance_passing_class01.cs b/src/tests/JIT/Generics/Parameters/instance_passing_class01.cs index 43727ce54ab2e..e2c6066b7f645 100644 --- a/src/tests/JIT/Generics/Parameters/instance_passing_class01.cs +++ b/src/tests/JIT/Generics/Parameters/instance_passing_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/instance_passing_class01.csproj b/src/tests/JIT/Generics/Parameters/instance_passing_class01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/instance_passing_class01.csproj rename to src/tests/JIT/Generics/Parameters/instance_passing_class01_Parameters.csproj index 2ae4c9983e2c0..fa8917b259c53 100644 --- a/src/tests/JIT/Generics/Parameters/instance_passing_class01.csproj +++ b/src/tests/JIT/Generics/Parameters/instance_passing_class01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/instance_passing_struct01.cs b/src/tests/JIT/Generics/Parameters/instance_passing_struct01.cs index 907e0f1607cf0..9c2d1f08cf408 100644 --- a/src/tests/JIT/Generics/Parameters/instance_passing_struct01.cs +++ b/src/tests/JIT/Generics/Parameters/instance_passing_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/instance_passing_struct01.csproj b/src/tests/JIT/Generics/Parameters/instance_passing_struct01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/instance_passing_struct01.csproj rename to src/tests/JIT/Generics/Parameters/instance_passing_struct01_Parameters.csproj index 26877b500a96c..b693e0e7075ef 100644 --- a/src/tests/JIT/Generics/Parameters/instance_passing_struct01.csproj +++ b/src/tests/JIT/Generics/Parameters/instance_passing_struct01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/static_assignment_class01.cs b/src/tests/JIT/Generics/Parameters/static_assignment_class01.cs index 118c720d23106..a6f8a31aaa44f 100644 --- a/src/tests/JIT/Generics/Parameters/static_assignment_class01.cs +++ b/src/tests/JIT/Generics/Parameters/static_assignment_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -50,7 +51,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/static_assignment_class01.csproj b/src/tests/JIT/Generics/Parameters/static_assignment_class01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/static_assignment_class01.csproj rename to src/tests/JIT/Generics/Parameters/static_assignment_class01_Parameters.csproj index 8e494627c55d8..b67a0be90e41b 100644 --- a/src/tests/JIT/Generics/Parameters/static_assignment_class01.csproj +++ b/src/tests/JIT/Generics/Parameters/static_assignment_class01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/static_assignment_struct01.cs b/src/tests/JIT/Generics/Parameters/static_assignment_struct01.cs index a3473c32061d0..efb73bf6ba8f7 100644 --- a/src/tests/JIT/Generics/Parameters/static_assignment_struct01.cs +++ b/src/tests/JIT/Generics/Parameters/static_assignment_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -50,7 +51,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/static_assignment_struct01.csproj b/src/tests/JIT/Generics/Parameters/static_assignment_struct01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/static_assignment_struct01.csproj rename to src/tests/JIT/Generics/Parameters/static_assignment_struct01_Parameters.csproj index 4348e4ac795a0..67ad3c3807d72 100644 --- a/src/tests/JIT/Generics/Parameters/static_assignment_struct01.csproj +++ b/src/tests/JIT/Generics/Parameters/static_assignment_struct01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/static_equalnull_class01.cs b/src/tests/JIT/Generics/Parameters/static_equalnull_class01.cs index 84f1e744993d8..34c93a9904087 100644 --- a/src/tests/JIT/Generics/Parameters/static_equalnull_class01.cs +++ b/src/tests/JIT/Generics/Parameters/static_equalnull_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -45,7 +46,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Parameters/static_equalnull_class01.csproj b/src/tests/JIT/Generics/Parameters/static_equalnull_class01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/static_equalnull_class01.csproj rename to src/tests/JIT/Generics/Parameters/static_equalnull_class01_Parameters.csproj index 30662e9692246..7339023b44fef 100644 --- a/src/tests/JIT/Generics/Parameters/static_equalnull_class01.csproj +++ b/src/tests/JIT/Generics/Parameters/static_equalnull_class01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/static_equalnull_struct01.cs b/src/tests/JIT/Generics/Parameters/static_equalnull_struct01.cs index 06b56e6fd02db..1ef74d5053b35 100644 --- a/src/tests/JIT/Generics/Parameters/static_equalnull_struct01.cs +++ b/src/tests/JIT/Generics/Parameters/static_equalnull_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -45,7 +46,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int = 0; diff --git a/src/tests/JIT/Generics/Parameters/static_equalnull_struct01.csproj b/src/tests/JIT/Generics/Parameters/static_equalnull_struct01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/static_equalnull_struct01.csproj rename to src/tests/JIT/Generics/Parameters/static_equalnull_struct01_Parameters.csproj index 909bcaed7936e..43229fb4f4b50 100644 --- a/src/tests/JIT/Generics/Parameters/static_equalnull_struct01.csproj +++ b/src/tests/JIT/Generics/Parameters/static_equalnull_struct01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/static_passing_class01.cs b/src/tests/JIT/Generics/Parameters/static_passing_class01.cs index 67970672024f7..070aa71ddf22c 100644 --- a/src/tests/JIT/Generics/Parameters/static_passing_class01.cs +++ b/src/tests/JIT/Generics/Parameters/static_passing_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/static_passing_class01.csproj b/src/tests/JIT/Generics/Parameters/static_passing_class01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/static_passing_class01.csproj rename to src/tests/JIT/Generics/Parameters/static_passing_class01_Parameters.csproj index a83e76cc5d26e..8cfe5f50e2dd9 100644 --- a/src/tests/JIT/Generics/Parameters/static_passing_class01.csproj +++ b/src/tests/JIT/Generics/Parameters/static_passing_class01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Parameters/static_passing_struct01.cs b/src/tests/JIT/Generics/Parameters/static_passing_struct01.cs index 66185374509f2..19231d9872317 100644 --- a/src/tests/JIT/Generics/Parameters/static_passing_struct01.cs +++ b/src/tests/JIT/Generics/Parameters/static_passing_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { int _int1 = 1; diff --git a/src/tests/JIT/Generics/Parameters/static_passing_struct01.csproj b/src/tests/JIT/Generics/Parameters/static_passing_struct01_Parameters.csproj similarity index 89% rename from src/tests/JIT/Generics/Parameters/static_passing_struct01.csproj rename to src/tests/JIT/Generics/Parameters/static_passing_struct01_Parameters.csproj index d57e12bde6068..6c0d0455a3cb4 100644 --- a/src/tests/JIT/Generics/Parameters/static_passing_struct01.csproj +++ b/src/tests/JIT/Generics/Parameters/static_passing_struct01_Parameters.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/TypeParameters/default_class01.cs b/src/tests/JIT/Generics/TypeParameters/default_class01.cs index 91cb4a89cb9ec..a66a385b95132 100644 --- a/src/tests/JIT/Generics/TypeParameters/default_class01.cs +++ b/src/tests/JIT/Generics/TypeParameters/default_class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -54,7 +55,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().DefaultTest(false)); Eval(new Gen().DefaultTest(false)); diff --git a/src/tests/JIT/Generics/TypeParameters/default_class01.csproj b/src/tests/JIT/Generics/TypeParameters/default_class01.csproj index 97bdc50b57a5c..2d591d8c35778 100644 --- a/src/tests/JIT/Generics/TypeParameters/default_class01.csproj +++ b/src/tests/JIT/Generics/TypeParameters/default_class01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/TypeParameters/default_struct01.cs b/src/tests/JIT/Generics/TypeParameters/default_struct01.cs index b48bc0de63116..d91d15ae9cd52 100644 --- a/src/tests/JIT/Generics/TypeParameters/default_struct01.cs +++ b/src/tests/JIT/Generics/TypeParameters/default_struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -54,7 +55,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().DefaultTest(false)); Eval(new Gen().DefaultTest(false)); diff --git a/src/tests/JIT/Generics/TypeParameters/default_struct01.csproj b/src/tests/JIT/Generics/TypeParameters/default_struct01.csproj index 376d25f5abdd7..66719f5f3d0de 100644 --- a/src/tests/JIT/Generics/TypeParameters/default_struct01.csproj +++ b/src/tests/JIT/Generics/TypeParameters/default_struct01.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/Struct02.cs b/src/tests/JIT/Generics/Typeof/Struct02.cs index 8ed6d9f4929cf..97612f5258f49 100644 --- a/src/tests/JIT/Generics/Typeof/Struct02.cs +++ b/src/tests/JIT/Generics/Typeof/Struct02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new int())).InstVerify(typeof(int), typeof(int))); Eval((new Gen(new int(), new double())).InstVerify(typeof(int), typeof(double))); diff --git a/src/tests/JIT/Generics/Typeof/class01.cs b/src/tests/JIT/Generics/Typeof/class01.cs index 396fc41f85158..847955603369d 100644 --- a/src/tests/JIT/Generics/Typeof/class01.cs +++ b/src/tests/JIT/Generics/Typeof/class01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -60,7 +61,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int())).InstVerify(typeof(int))); Eval((new Gen(new double())).InstVerify(typeof(double))); diff --git a/src/tests/JIT/Generics/Typeof/class01.csproj b/src/tests/JIT/Generics/Typeof/class01_Typeof.csproj similarity index 88% rename from src/tests/JIT/Generics/Typeof/class01.csproj rename to src/tests/JIT/Generics/Typeof/class01_Typeof.csproj index a554844fab059..39ef8ced0e4c0 100644 --- a/src/tests/JIT/Generics/Typeof/class01.csproj +++ b/src/tests/JIT/Generics/Typeof/class01_Typeof.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/class02.cs b/src/tests/JIT/Generics/Typeof/class02.cs index 835056ff17875..70b21a4843e42 100644 --- a/src/tests/JIT/Generics/Typeof/class02.cs +++ b/src/tests/JIT/Generics/Typeof/class02.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -68,7 +69,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new int())).InstVerify(typeof(int), typeof(int))); Eval((new Gen(new int(), new double())).InstVerify(typeof(int), typeof(double))); diff --git a/src/tests/JIT/Generics/Typeof/class02.csproj b/src/tests/JIT/Generics/Typeof/class02_Typeof.csproj similarity index 88% rename from src/tests/JIT/Generics/Typeof/class02.csproj rename to src/tests/JIT/Generics/Typeof/class02_Typeof.csproj index 99cf72b379a18..208a04af6018b 100644 --- a/src/tests/JIT/Generics/Typeof/class02.csproj +++ b/src/tests/JIT/Generics/Typeof/class02_Typeof.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/class03.cs b/src/tests/JIT/Generics/Typeof/class03.cs index 8451277776f16..098ca044346ba 100644 --- a/src/tests/JIT/Generics/Typeof/class03.cs +++ b/src/tests/JIT/Generics/Typeof/class03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -75,7 +76,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new double(), new Guid())).InstVerify(typeof(int), typeof(double), typeof(Guid))); Eval((new Gen(new double(), new Guid(), "string")).InstVerify(typeof(double), typeof(Guid), typeof(string))); diff --git a/src/tests/JIT/Generics/Typeof/class03.csproj b/src/tests/JIT/Generics/Typeof/class03_Typeof.csproj similarity index 88% rename from src/tests/JIT/Generics/Typeof/class03.csproj rename to src/tests/JIT/Generics/Typeof/class03_Typeof.csproj index 5a5fb6a047371..d8f2b6dd63c44 100644 --- a/src/tests/JIT/Generics/Typeof/class03.csproj +++ b/src/tests/JIT/Generics/Typeof/class03_Typeof.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/dynamicTypes.cs b/src/tests/JIT/Generics/Typeof/dynamicTypes.cs index bb86ef237fd20..5e8e58fb5dea8 100644 --- a/src/tests/JIT/Generics/Typeof/dynamicTypes.cs +++ b/src/tests/JIT/Generics/Typeof/dynamicTypes.cs @@ -42,6 +42,7 @@ sealed class DS : B using System; using System.Reflection; using System.Runtime.CompilerServices; +using Xunit; class X { @@ -123,10 +124,10 @@ sealed class DS : B public override void incCount() { ds_count*= 41;} } -class mainMethod +public class mainMethod { public static bool failed = false; - public static void checkGetType(X x) + internal static void checkGetType(X x) { if(x.GetType() == typeof(DS)) (new DS()).incCount(); if(x.GetType() == typeof(CS)) (new CS()).incCount(); @@ -143,7 +144,7 @@ public static void checkGetType(X x) if(x.GetType() == null) (new X()).incCount(); } - public static void checkIs(X x) + internal static void checkIs(X x) { //start from X //if(x is null ) (new X< X >()).incCount(); @@ -160,7 +161,7 @@ public static void checkIs(X x) if(x is CS) (new CS()).incCount(); if(x is DS) (new DS()).incCount(); } - public static void checkAs(X x) + internal static void checkAs(X x) { X< X > x6 = x as X< X >; if(x6 != null) (new X< X >()).incCount(); @@ -195,7 +196,7 @@ public static void checkAs(X x) Console.WriteLine(D.b_count); */ } - public static void checkGetTypeStringCast(X x) + internal static void checkGetTypeStringCast(X x) { if(x.GetType() == typeof(DS)) ((DS)x).incCount(); if(x.GetType() == typeof(D)) ((D)x).incCount(); @@ -209,7 +210,7 @@ public static void checkGetTypeStringCast(X x) if(x.GetType() == null) ((X)x).incCount(); //if(x.GetType() == typeof(DS)) ((DS)x).incCount(); } - public static void checkGetTypeIntCast(X x) + internal static void checkGetTypeIntCast(X x) { if(x.GetType() == typeof(CS)) ((CS)x).incCount(); if(x.GetType() == typeof(C)) ((C)x).incCount(); @@ -224,7 +225,7 @@ public static void checkGetTypeIntCast(X x) //if(x.GetType() == typeof(CS)) ((CS)x).incCount(); } - public static void checkIsStringCast(X x) + internal static void checkIsStringCast(X x) { //if(x is null ) ((X< X >)x).incCount(); //if(x is X< X >) ((X< X >)x).incCount(); @@ -242,7 +243,7 @@ public static void checkIsStringCast(X x) //if(x is DS) ((DS)x).incCount(); } - public static void checkIsIntCast(X x) + internal static void checkIsIntCast(X x) { //if(x is null ) ((X< X >)x).incCount(); //if(x is X< X >) ((X< X >)x).incCount(); @@ -260,7 +261,7 @@ public static void checkIsIntCast(X x) //if(x is CS) ((CS)x).incCount(); } - public static void checkAsStringCast(X x) + internal static void checkAsStringCast(X x) { //X< X > x6 = x as X< X >; //if(x6 != null) ((X< X >)x).incCount(); @@ -293,7 +294,7 @@ public static void checkAsStringCast(X x) checkCount(ref B.b_count, 31, "AS Failed for D"); */ } - public static void checkAsIntCast(X x) + internal static void checkAsIntCast(X x) { //X< X > x6 = x as X< X >; //if(x6 != null) ((X< X >)x).incCount(); @@ -752,7 +753,8 @@ public static void callCheckAsIntCast() //Console.WriteLine("-----------{0}", i++); } - public static int Main() + [Fact] + public static int TestEntryPoint() { callCheckGetType(); callCheckIs(); diff --git a/src/tests/JIT/Generics/Typeof/dynamicTypes.csproj b/src/tests/JIT/Generics/Typeof/dynamicTypes.csproj index f922a17324215..391e1472bc1d4 100644 --- a/src/tests/JIT/Generics/Typeof/dynamicTypes.csproj +++ b/src/tests/JIT/Generics/Typeof/dynamicTypes.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/objectBoxing.cs b/src/tests/JIT/Generics/Typeof/objectBoxing.cs index 5ad61293165f7..95c2a382bc074 100644 --- a/src/tests/JIT/Generics/Typeof/objectBoxing.cs +++ b/src/tests/JIT/Generics/Typeof/objectBoxing.cs @@ -7,6 +7,7 @@ using System; using System.Reflection; using System.Runtime.CompilerServices; +using Xunit; class X { @@ -53,7 +54,7 @@ sealed class DS : B public override void incCount() { ds_count *= 41; } } -class mainMethod +public class mainMethod { public static bool failed = false; public static void checkGetType(System.Object x) @@ -350,7 +351,8 @@ public static void callCheckAsObjectCast() Console.WriteLine("-----------{0}", i++); } - public static int Main() + [Fact] + public static int TestEntryPoint() { callCheckGetType(); callCheckIs(); diff --git a/src/tests/JIT/Generics/Typeof/objectBoxing.csproj b/src/tests/JIT/Generics/Typeof/objectBoxing.csproj index 63984409a773d..ca50a2392003c 100644 --- a/src/tests/JIT/Generics/Typeof/objectBoxing.csproj +++ b/src/tests/JIT/Generics/Typeof/objectBoxing.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/refTypesdynamic.cs b/src/tests/JIT/Generics/Typeof/refTypesdynamic.cs index f8b8fe2d54e11..9e1fe373c9296 100644 --- a/src/tests/JIT/Generics/Typeof/refTypesdynamic.cs +++ b/src/tests/JIT/Generics/Typeof/refTypesdynamic.cs @@ -8,6 +8,7 @@ using System; using System.Reflection; using System.Runtime.CompilerServices; +using Xunit; class X { @@ -87,10 +88,10 @@ sealed class DS : B public override void incCount() { ds_count *= 41; } } -class mainMethod +public class mainMethod { public static bool failed = false; - public static void checkGetType(X x) + internal static void checkGetType(X x) { if (x.GetType() == typeof(DS)) (new DS()).incCount(); if (x.GetType() == typeof(CS)) (new CS()).incCount(); @@ -107,7 +108,7 @@ public static void checkGetType(X x) if (x.GetType() == null) (new X()).incCount(); } - public static void checkIs(X x) + internal static void checkIs(X x) { //start from X if (x is X>) (new X>()).incCount(); @@ -123,7 +124,7 @@ public static void checkIs(X x) if (x is CS) (new CS()).incCount(); if (x is DS) (new DS()).incCount(); } - public static void checkAs(X x) + internal static void checkAs(X x) { X> x6 = x as X>; if (x6 != null) (new X>()).incCount(); @@ -151,7 +152,7 @@ public static void checkAs(X x) if (ds != null) (new DS()).incCount(); } - public static void checkGetTypeStringCast(X x) + internal static void checkGetTypeStringCast(X x) { if (x.GetType() == typeof(DS)) ((DS)x).incCount(); if (x.GetType() == typeof(D)) ((D)x).incCount(); @@ -159,7 +160,7 @@ public static void checkGetTypeStringCast(X x) if (x.GetType() == typeof(X)) ((X)x).incCount(); if (x.GetType() == null) ((X)x).incCount(); } - public static void checkGetTypeIntCast(X x) + internal static void checkGetTypeIntCast(X x) { if (x.GetType() == typeof(CS)) ((CS)x).incCount(); if (x.GetType() == typeof(C)) ((C)x).incCount(); @@ -168,7 +169,7 @@ public static void checkGetTypeIntCast(X x) if (x.GetType() == null) ((X)x).incCount(); } - public static void checkIsStringCast(X x) + internal static void checkIsStringCast(X x) { if (x is X) ((X)x).incCount(); if (x is B) ((B)x).incCount(); @@ -176,7 +177,7 @@ public static void checkIsStringCast(X x) if (x is DS) ((DS)x).incCount(); } - public static void checkIsIntCast(X x) + internal static void checkIsIntCast(X x) { if (x is X) ((X)x).incCount(); if (x is A) ((A)x).incCount(); @@ -184,7 +185,7 @@ public static void checkIsIntCast(X x) if (x is CS) ((CS)x).incCount(); } - public static void checkAsStringCast(X x) + internal static void checkAsStringCast(X x) { X x2 = x as X; if (x2 != null) ((X)x).incCount(); @@ -196,7 +197,7 @@ public static void checkAsStringCast(X x) if (ds != null) ((DS)x).incCount(); } - public static void checkAsIntCast(X x) + internal static void checkAsIntCast(X x) { X x1 = x as X; if (x1 != null) ((X)x).incCount(); @@ -469,7 +470,8 @@ public static void callCheckAsIntCast() Console.WriteLine("-----------{0}", i++); } - public static int Main() + [Fact] + public static int TestEntryPoint() { callCheckGetType(); callCheckIs(); diff --git a/src/tests/JIT/Generics/Typeof/refTypesdynamic.csproj b/src/tests/JIT/Generics/Typeof/refTypesdynamic.csproj index 411a2b2630659..46b6c575f571c 100644 --- a/src/tests/JIT/Generics/Typeof/refTypesdynamic.csproj +++ b/src/tests/JIT/Generics/Typeof/refTypesdynamic.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/struct01.cs b/src/tests/JIT/Generics/Typeof/struct01.cs index 3e46106922e79..ce47c452ffef0 100644 --- a/src/tests/JIT/Generics/Typeof/struct01.cs +++ b/src/tests/JIT/Generics/Typeof/struct01.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -60,7 +61,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int())).InstVerify(typeof(int))); Eval((new Gen(new double())).InstVerify(typeof(double))); diff --git a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj b/src/tests/JIT/Generics/Typeof/struct01_Typeof.csproj similarity index 88% rename from src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj rename to src/tests/JIT/Generics/Typeof/struct01_Typeof.csproj index 44e6004bf7885..8a9b025d4f010 100644 --- a/src/tests/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj +++ b/src/tests/JIT/Generics/Typeof/struct01_Typeof.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/struct02.csproj b/src/tests/JIT/Generics/Typeof/struct02_Typeof.csproj similarity index 88% rename from src/tests/JIT/Generics/Typeof/struct02.csproj rename to src/tests/JIT/Generics/Typeof/struct02_Typeof.csproj index 08ac227e184bb..48e6ed405b3ae 100644 --- a/src/tests/JIT/Generics/Typeof/struct02.csproj +++ b/src/tests/JIT/Generics/Typeof/struct02_Typeof.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/struct03.cs b/src/tests/JIT/Generics/Typeof/struct03.cs index 6a1f9ed5f75f6..c25aee0fc1b96 100644 --- a/src/tests/JIT/Generics/Typeof/struct03.cs +++ b/src/tests/JIT/Generics/Typeof/struct03.cs @@ -3,6 +3,7 @@ // using System; +using Xunit; public struct ValX0 { } public struct ValY0 { } @@ -75,7 +76,8 @@ public static void Eval(bool exp) } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval((new Gen(new int(), new double(), new Guid())).InstVerify(typeof(int), typeof(double), typeof(Guid))); Eval((new Gen(new double(), new Guid(), "string")).InstVerify(typeof(double), typeof(Guid), typeof(string))); diff --git a/src/tests/JIT/Generics/Typeof/struct03.csproj b/src/tests/JIT/Generics/Typeof/struct03_Typeof.csproj similarity index 88% rename from src/tests/JIT/Generics/Typeof/struct03.csproj rename to src/tests/JIT/Generics/Typeof/struct03_Typeof.csproj index 2d72f4f889d6e..299b50cd103a0 100644 --- a/src/tests/JIT/Generics/Typeof/struct03.csproj +++ b/src/tests/JIT/Generics/Typeof/struct03_Typeof.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/Typeof/valueTypeBoxing.cs b/src/tests/JIT/Generics/Typeof/valueTypeBoxing.cs index ed472be207d4a..d20a3a50dff49 100644 --- a/src/tests/JIT/Generics/Typeof/valueTypeBoxing.cs +++ b/src/tests/JIT/Generics/Typeof/valueTypeBoxing.cs @@ -7,6 +7,7 @@ using System; using System.Reflection; using System.Runtime.CompilerServices; +using Xunit; interface X { @@ -57,7 +58,7 @@ enum DS Day = 1, Night = 0 }; -struct mainMethod +public struct mainMethod { public static bool failed = false; public static void checkGetTypeValueType(System.ValueType x) @@ -223,7 +224,8 @@ public static void callCheckIsValueTypeCast() Console.WriteLine("-----------{0}", i++); } - public static int Main() + [Fact] + public static int TestEntryPoint() { callCheckGetTypeValueType(); callCheckIsValueType(); diff --git a/src/tests/JIT/Generics/Typeof/valueTypeBoxing.csproj b/src/tests/JIT/Generics/Typeof/valueTypeBoxing.csproj index 736da7a1af9b5..c20c7da6c8978 100644 --- a/src/tests/JIT/Generics/Typeof/valueTypeBoxing.csproj +++ b/src/tests/JIT/Generics/Typeof/valueTypeBoxing.csproj @@ -1,6 +1,5 @@ - Exe 1 diff --git a/src/tests/JIT/Generics/pinvoke/instance01.cs b/src/tests/JIT/Generics/pinvoke/instance01.cs index cf3e27477f32e..d90b430b1b465 100644 --- a/src/tests/JIT/Generics/pinvoke/instance01.cs +++ b/src/tests/JIT/Generics/pinvoke/instance01.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.InteropServices; +using Xunit; internal class Win32Interop { @@ -39,7 +40,8 @@ public static void Eval(bool exp) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().PInvokeTest() == 6); Eval(new Gen().PInvokeTest() == 6); diff --git a/src/tests/JIT/Generics/pinvoke/instance01.csproj b/src/tests/JIT/Generics/pinvoke/instance01.csproj index 06b90e2237f27..bbbe5edf70966 100644 --- a/src/tests/JIT/Generics/pinvoke/instance01.csproj +++ b/src/tests/JIT/Generics/pinvoke/instance01.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Generics/pinvoke/instance02.cs b/src/tests/JIT/Generics/pinvoke/instance02.cs index 50b94c5270a2e..745a0e6b06423 100644 --- a/src/tests/JIT/Generics/pinvoke/instance02.cs +++ b/src/tests/JIT/Generics/pinvoke/instance02.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.InteropServices; +using Xunit; internal class Win32Interop { @@ -39,7 +40,8 @@ public static void Eval(bool exp) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().PInvokeTest() == 6); Eval(new Gen().PInvokeTest() == 6); diff --git a/src/tests/JIT/Generics/pinvoke/instance02.csproj b/src/tests/JIT/Generics/pinvoke/instance02.csproj index b311964874279..02c7d9d3ced30 100644 --- a/src/tests/JIT/Generics/pinvoke/instance02.csproj +++ b/src/tests/JIT/Generics/pinvoke/instance02.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Generics/pinvoke/instance03.cs b/src/tests/JIT/Generics/pinvoke/instance03.cs index 2dc217d8a2f1f..49ef955d19107 100644 --- a/src/tests/JIT/Generics/pinvoke/instance03.cs +++ b/src/tests/JIT/Generics/pinvoke/instance03.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.InteropServices; +using Xunit; internal class Win32Interop { @@ -39,7 +40,8 @@ public static void Eval(bool exp) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(new Gen().PInvokeTest() == 6); Eval(new Gen().PInvokeTest() == 6); diff --git a/src/tests/JIT/Generics/pinvoke/instance03.csproj b/src/tests/JIT/Generics/pinvoke/instance03.csproj index d2bd846f35aa2..3cb2eb519ca1c 100644 --- a/src/tests/JIT/Generics/pinvoke/instance03.csproj +++ b/src/tests/JIT/Generics/pinvoke/instance03.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Generics/pinvoke/static01.cs b/src/tests/JIT/Generics/pinvoke/static01.cs index 0424b5e7d8de0..b750d273597dc 100644 --- a/src/tests/JIT/Generics/pinvoke/static01.cs +++ b/src/tests/JIT/Generics/pinvoke/static01.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.InteropServices; +using Xunit; internal class Win32Interop { @@ -39,7 +40,8 @@ public static void Eval(bool exp) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(Gen.PInvokeTest() == 6); Eval(Gen.PInvokeTest() == 6); diff --git a/src/tests/JIT/Generics/pinvoke/static01.csproj b/src/tests/JIT/Generics/pinvoke/static01.csproj index 9d68d9b551447..78b5f9c72777f 100644 --- a/src/tests/JIT/Generics/pinvoke/static01.csproj +++ b/src/tests/JIT/Generics/pinvoke/static01.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Generics/pinvoke/static02.cs b/src/tests/JIT/Generics/pinvoke/static02.cs index 8d27ee15bf1f7..28ad3b10516ed 100644 --- a/src/tests/JIT/Generics/pinvoke/static02.cs +++ b/src/tests/JIT/Generics/pinvoke/static02.cs @@ -3,6 +3,7 @@ using System; using System.Runtime.InteropServices; +using Xunit; internal class Win32Interop { @@ -39,7 +40,8 @@ public static void Eval(bool exp) } } - public static int Main() + [Fact] + public static int TestEntryPoint() { Eval(Gen.PInvokeTest() == 6); Eval(Gen.PInvokeTest() == 6); diff --git a/src/tests/JIT/Generics/pinvoke/static02.csproj b/src/tests/JIT/Generics/pinvoke/static02.csproj index 66eb2342faf24..611e13ef67f8c 100644 --- a/src/tests/JIT/Generics/pinvoke/static02.csproj +++ b/src/tests/JIT/Generics/pinvoke/static02.csproj @@ -1,6 +1,7 @@ - Exe + + true 1 true diff --git a/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il b/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il index b0dfb21a68e3d..d61cd2edfd799 100644 --- a/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il +++ b/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il @@ -110,10 +110,10 @@ } // end of class MyStruct2`1 -.class private auto ansi beforefieldinit My +.class public auto ansi beforefieldinit My extends [mscorlib]System.Object { - .method private hidebysig static int32 Main() cil managed + .method public hidebysig static int32 Main() cil managed { .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 diff --git a/src/tests/JIT/Generics/regression/DDB148379/ddb148379.ilproj b/src/tests/JIT/Generics/regression/DDB148379/ddb148379.ilproj index 5518bf180068c..a8d5f6f940b0c 100644 --- a/src/tests/JIT/Generics/regression/DDB148379/ddb148379.ilproj +++ b/src/tests/JIT/Generics/regression/DDB148379/ddb148379.ilproj @@ -1,6 +1,5 @@ - Exe 1