dotnet · BrianBohe · Jan 20, 2023 · Feb 3, 2023 · Jan 20, 2023 · Jan 20, 2023
diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
@@ -305,10 +305,15 @@ private static string GenerateStandaloneSimpleTestRunner(ImmutableArray<ITestInf
         ITestReporterWrapper reporter = new NoTestReporting();
         StringBuilder builder = new();
         builder.AppendLine(string.Join("\n", aliasMap.Values.Where(alias => alias != "global").Select(alias => $"extern alias {alias};")));
+        builder.AppendLine("namespace __GeneratedMainWrapper;");
+        builder.AppendLine("class __GeneratedMainWrapper {");
+        builder.AppendLine("public static int Main() {");
         builder.AppendLine("try {");
         builder.AppendLine(string.Join("\n", testInfos.Select(m => m.GenerateTestExecution(reporter))));
         builder.AppendLine("} catch(System.Exception ex) { System.Console.WriteLine(ex.ToString()); return 101; }");
         builder.AppendLine("return 100;");
+        builder.AppendLine("}");
+        builder.AppendLine("}");
         return builder.ToString();
     }
 

diff --git a/src/tests/JIT/Directed/Arrays/Complex1.csproj b/src/tests/JIT/Directed/Arrays/Complex1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/Arrays/Complex2.csproj b/src/tests/JIT/Directed/Arrays/Complex2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/Arrays/LoopCloning.cs b/src/tests/JIT/Directed/Arrays/LoopCloning.cs
@@ -5,10 +5,12 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
+using Xunit;
 
 public class Program
 {
-    public static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         int result = 0;
         try {

diff --git a/src/tests/JIT/Directed/Arrays/LoopCloning.csproj b/src/tests/JIT/Directed/Arrays/LoopCloning.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/Arrays/Simple1.csproj b/src/tests/JIT/Directed/Arrays/Simple1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/Arrays/Simple2.csproj b/src/tests/JIT/Directed/Arrays/Simple2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/Arrays/complex1.cs b/src/tests/JIT/Directed/Arrays/complex1.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 
 // Do a complex 5 dimensional Jagged array.
 struct Complex
@@ -13,10 +14,11 @@ public void mul_em()
 	c = a * b;
   }
 };
-public 
-class Complex_Array_Test
+
+public class Complex_Array_Test
 {
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Console.WriteLine("Starting...");
 		int SIZE = 10;

diff --git a/src/tests/JIT/Directed/Arrays/complex2.cs b/src/tests/JIT/Directed/Arrays/complex2.cs
@@ -3,6 +3,7 @@
 //
 
 using System;
+using Xunit;
 public struct Yak
 {
     public Int32 a;
@@ -16,13 +17,14 @@ public void Do_Something()
 }
 
 
-internal class Complex2_Array_Test
+public class Complex2_Array_Test
 {
     public static void test(Yak[,,,,,,] Odd_Variable)
     {
         Console.Write(Odd_Variable.Length);
     }
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine("Starting...");
         int SIZE = 2;

diff --git a/src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs b/src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs
@@ -3,8 +3,9 @@
 //
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-class NintIndexOutOfRangeTest
+public class NintIndexOutOfRangeTest
 {
     [MethodImpl(MethodImplOptions.NoInlining)]
     static void Stelem_Ref(object[] arr, nint i, Object value)
@@ -20,7 +21,8 @@ static void LdElemA(object[] arr, nint i)
         LdElemATestHelper(ref arr[i]);
     }
 
-    public static unsafe int Main()
+    [Fact]
+    public static unsafe int TestEntryPoint()
     {
         long longIndex = ((long)1) << 32;
         nint index = (nint)longIndex;

diff --git a/src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj b/src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/Arrays/simple1.cs b/src/tests/JIT/Directed/Arrays/simple1.cs
@@ -3,12 +3,14 @@
 //
 
 using System;
-public 
+using Xunit;
+
 // Do a simple 5 dimensional Jagged array.
 
-class Simple_Array_Test
+public class Simple_Array_Test
 {
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Console.WriteLine("Starting...");
 		int SIZE = 10;

diff --git a/src/tests/JIT/Directed/Arrays/simple2.cs b/src/tests/JIT/Directed/Arrays/simple2.cs
@@ -3,10 +3,12 @@
 //
 
 using System;
+using Xunit;
 
-internal class Simple2_Array_Test
+public class Simple2_Array_Test
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Console.WriteLine("Starting...");
         int SIZE = 10;

diff --git a/src/tests/JIT/Directed/BitTest/BitTest.cs b/src/tests/JIT/Directed/BitTest/BitTest.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
-class Program
+public class Program
 {
     [MethodImpl(MethodImplOptions.NoInlining)]
     static bool I1_BT_reg_reg(sbyte x, int y) => (x & (1 << y)) != 0;
@@ -37,7 +38,8 @@ class Program
     [MethodImpl(MethodImplOptions.NoInlining)]
     static bool I8_BT_mem_reg(ref long x, int y) => (x & (1L << y)) != 0;
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         sbyte i1min = sbyte.MinValue;
         sbyte i1one = 1;

diff --git a/src/tests/JIT/Directed/BitTest/BitTest.csproj b/src/tests/JIT/Directed/BitTest/BitTest.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>(3);
             new DerivedClass<int>(8);

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>("NotNull");
             new DerivedClass<int>(null);

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>(7);
             return 100;

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>(7);
             return 100;

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<Reftype>();
             new DerivedClass<Valuetype>();

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>(3);
             new DerivedClass<int>(8);

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>("NotNull");
             new DerivedClass<int>(null);

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.cs b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.cs
@@ -11,12 +11,14 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace Test
 {
-    static class App
+    public static class App
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new DerivedClass<int>(7);
             return 100;

diff --git a/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj b/src/tests/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>