Merge remaining JIT tests

src/tests/JIT/BBT/Scenario4/Not-Int32.ilproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/JIT/CodeGenBringUpTests/Directory.Build.props

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>

src/tests/JIT/Directed/Directory.Build.props

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>

src/tests/JIT/Directory.Build.props

@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>

src/tests/JIT/Generics/Directory.Build.props

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>

src/tests/JIT/HardwareIntrinsics/Directory.Build.props

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <ItemGroup>

src/tests/JIT/IL_Conformance/Directory.Build.props

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\Directory.Merged.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>

src/tests/JIT/Intrinsics/BMI1Intrinsics.cs

@@ -1,13 +1,15 @@
 using System;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace BMI1Intrinsics
 {
-    internal class Program
+    public class Program
     {
         private static int _errorCode = 100;
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             // bmi1 expression are folded to hwintrinsics that return identical results
 

src/tests/JIT/Intrinsics/BMI1Intrinsics_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>

src/tests/JIT/Intrinsics/BMI1Intrinsicss_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <DebugType>None</DebugType>
     <Optimize />
   </PropertyGroup>

src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness.cs

@@ -7,10 +7,11 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Internal;
+using Xunit;
 
 namespace BinaryPrimitivesReverseEndianness
 {
-    class Program
+    public class Program
     {
         public const int Pass = 100;
         public const int Fail = 0;
@@ -33,7 +34,8 @@ class Program
         private static readonly byte[] s_bufferLESigned64 = new byte[] { 0x10, 0x32, 0x54, 0x76, 0x98, 0xba, 0xdc, 0x1e };
         private static readonly byte[] s_bufferBESigned64 = new byte[] { 0x1e, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 };
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             /*
              * CONST VALUE TESTS

src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/BitCast.il

@@ -5,6 +5,7 @@
 // This test checks implicit floating point and small type casts in IL
 
 .assembly extern System.Runtime {}
+.assembly extern xunit.core {}
 .assembly extern System.Console {}
 .assembly Bitcast {}
 
@@ -14,6 +15,9 @@
   .field private static int32 exitCode
   .method public hidebysig static int32  Main() cil managed
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     // Code size       306 (0x132)
     .maxstack  3

src/tests/JIT/Intrinsics/BitCast.ilproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/JIT/Intrinsics/BitOperationsIntrinsics_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <DebugType>None</DebugType>
     <Optimize />
   </PropertyGroup>

src/tests/JIT/Intrinsics/BitOperationsIntrinsics_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>

src/tests/JIT/Intrinsics/BitOperationsPopCount.cs

@@ -5,14 +5,16 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Xunit;
 
 namespace BitOperationsPopCountTest
 {
-    class Program
+    public class Program
     {
         private static int _errorCode = 100;
 
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             // PopCount calls with a constant argument are folded
 

src/tests/JIT/Intrinsics/CreateSpan_il.il

@@ -11,6 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )                         // .?_....:
   .ver 7:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly 'CreateSpan_il'
 {
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
@@ -37,12 +38,15 @@
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
-.class private auto ansi beforefieldinit CreateSpanTest
+.class public auto ansi beforefieldinit CreateSpanTest
        extends [System.Runtime]System.Object
 {
-  .method private hidebysig static int32 
+  .method public hidebysig static int32 
           Main() cil managed
   {
+    .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+        01 00 00 00
+    )
     .entrypoint
     // Code size       47 (0x2f)
     .maxstack  2

src/tests/JIT/Intrinsics/CreateSpan_il.ilproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/JIT/Intrinsics/MathCeilingDouble.cs

@@ -3,10 +3,11 @@
 //
 
 using System;
+using Xunit;
 
 namespace MathCeilingDoubleTest
 {
-    class Program
+    public class Program
     {
         public const int Pass = 100;
         public const int Fail = 0;
@@ -31,7 +32,8 @@ class Program
             8.8
         };
 
-        unsafe static int Main()
+        [Fact]
+        public unsafe static int TestEntryPoint()
         {
             double localValue = 9.9;
 

src/tests/JIT/Intrinsics/MathCeilingDouble_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathCeilingDouble_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathCeilingSingle.cs

@@ -3,10 +3,11 @@
 //
 
 using System;
+using Xunit;
 
 namespace MathCeilingSingleTest
 {
-    class Program
+    public class Program
     {
         public const int Pass = 100;
         public const int Fail = 0;
@@ -31,7 +32,8 @@ class Program
             8.8f
         };
 
-        unsafe static int Main()
+        [Fact]
+        public unsafe static int TestEntryPoint()
         {
             float localValue = 9.9f;
 

src/tests/JIT/Intrinsics/MathCeilingSingle_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathCeilingSingle_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathFloorDouble.cs

@@ -3,10 +3,11 @@
 //
 
 using System;
+using Xunit;
 
 namespace MathFloorDoubleTest
 {
-    class Program
+    public class Program
     {
         public const int Pass = 100;
         public const int Fail = 0;
@@ -31,7 +32,8 @@ class Program
             8.8
         };
 
-        unsafe static int Main()
+        [Fact]
+        public unsafe static int TestEntryPoint()
         {
             double localValue = 9.9;
 

src/tests/JIT/Intrinsics/MathFloorDouble_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathFloorDouble_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathFloorSingle.cs

@@ -3,10 +3,11 @@
 //
 
 using System;
+using Xunit;
 
 namespace MathFloorSingleTest
 {
-    class Program
+    public class Program
     {
         public const int Pass = 100;
         public const int Fail = 0;
@@ -31,7 +32,8 @@ class Program
             8.8f
         };
 
-        unsafe static int Main()
+        [Fact]
+        public unsafe static int TestEntryPoint()
         {
             float localValue = 9.9f;
 

src/tests/JIT/Intrinsics/MathFloorSingle_r.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/tests/JIT/Intrinsics/MathFloorSingle_ro.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>