dotnet · markples · Mar 31, 2023 · Feb 3, 2023 · Feb 3, 2023 · Feb 3, 2023
diff --git a/src/tests/Common/XUnitWrapperLibrary/TestSummary.cs b/src/tests/Common/XUnitWrapperLibrary/TestSummary.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Text;
+using System.Xml;
 namespace XUnitWrapperLibrary;
 
 public class TestSummary
@@ -43,7 +44,7 @@ public string ToXmlString()
                               + $@" method=""{MethodName}"" time=""{Duration.TotalSeconds:F6}""");
 
             string outputElement = !string.IsNullOrWhiteSpace(Output)
-                                 ? $"<output><![CDATA[{Output}]]></output>"
+                                 ? $"<output><![CDATA[{XmlConvert.EncodeName(Output)}]]></output>"
                                  : string.Empty;
 
             if (Exception is not null)

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.cs
@@ -3,23 +3,25 @@
 //
 
 using System;
+using Xunit;
 
 public class Bug
 {
-    public void Func(ref String str)
+    internal void Func(ref String str)
     {
         Console.WriteLine(str.ToString());
         str = "Abc";
     }
 
-    public void run()
+    internal void run()
     {
         String[] str = new String[10];
         str[0] = "DEF";
         Func(ref str[0]);
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         (new Bug()).run();
         Console.WriteLine("Passed");

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.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/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using Xunit;
 namespace SetIPTest
 {
     public class SetIP
@@ -13,7 +14,7 @@ public SetIP()
         }
 
 
-        public static void F()
+        internal static void F()
         {
             String s;
             double d;
@@ -53,7 +54,8 @@ public static void F()
         }
 
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Console.WriteLine("Entering Main of SetIP");
 

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
     <DebugType>PdbOnly</DebugType>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.il b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.il
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
@@ -11,6 +12,9 @@
 .class public ILGEN_0x38e94b27 {
 
 .method public static int32 main() {
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+    01 00 00 00
+)
 .entrypoint
 .maxstack	10
 

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 //
 
+using Xunit;
 namespace Test
 {
     using System;
@@ -13,7 +14,8 @@ public BB Method1(float param2)
             return new BB();
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new BB().Method1(0.0f);
             return 100;

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.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/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 //
 
+using Xunit;
 namespace Test
 {
     using System;
@@ -15,7 +16,8 @@ BB Method3(float param2, ulong[] param3)
 
         static bool Static1(float[] param1) { return false; }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.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/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.cs
@@ -2,13 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 //
 
+using Xunit;
 namespace JitTest
 {
     using System;
 
     public class Test
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             ulong a = 0x0000000000000020;
             ulong b = 0xa697fcbfd6d232d1;

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.cs
@@ -2,13 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 //
 
+using Xunit;
 namespace Test
 {
     using System;
 
     public class App
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             ulong a = 0x00000000005d909c;
             ulong b = 0x00004021bfa15862;

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.cs b/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
 namespace DefaultNamespace
 {
@@ -135,7 +136,8 @@ public class Bug
         internal static readonly String[,] strArr = {{"This", " ", "a", " ", "test", " ", "of", " ", "patience", "."},
                                                                              {"This", " ", "a", " ", "test", " ", "of", " ", "patience", "."}};
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             new Bug();
             return 100;

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj b/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.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/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.il b/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.il
@@ -6,6 +6,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern legacy library mscorlib {}
 .assembly b07847
 {
@@ -17,6 +18,9 @@
 	.field public static int32 TLSFieldData at FieldData
 	.method public static int32 main() 
 	{
+		.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+		    01 00 00 00
+		)
 		.entrypoint
 		ldsfld	int32 test::TLSFieldData  
 		ldc.i4  51966

diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj b/src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on tls support see #2441 -->
     <DisableProjectBuild>true</DisableProjectBuild>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.il
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
@@ -13,6 +14,9 @@
 .class public _simple {
 
 .method public static int32 main() {
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+    01 00 00 00
+)
 .entrypoint
 .maxstack	100
 

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.il
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
@@ -13,6 +14,9 @@
 .class public _simple {
 
 .method public static int32 main() {
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+    01 00 00 00
+)
 .entrypoint
 .maxstack	100
 

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.il
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
@@ -13,6 +14,9 @@
 .class public _simple {
 
 .method public static int32 main() {
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+    01 00 00 00
+)
 .entrypoint
 .maxstack	100
 

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.il
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern legacy library mscorlib {}
+.assembly extern xunit.core {}
 .assembly extern System.Console
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
@@ -12,6 +13,9 @@
 .class public ExceptionTest {
 
 .method public static int32 main(){
+.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+    01 00 00 00
+)
 .entrypoint
 L1:
   newobj instance void [mscorlib]System.Exception::.ctor() throw

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>