dotnet · markples · Apr 14, 2023 · Feb 17, 2023 · Feb 25, 2023 · Feb 25, 2023
diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets
@@ -126,7 +126,7 @@ fi
 
  <BashCLRTestExitCodePrep Condition="$(_CLRTestNeedsToRun)">
 <![CDATA[
-if [ -z ${CLRTestExpectedExitCode+x} ]%3B then export CLRTestExpectedExitCode=$(CLRTestExitCode)%3B fi
+export CLRTestExpectedExitCode=$(CLRTestExitCode)
 echo BEGIN EXECUTION]]>
  </BashCLRTestExitCodePrep>
 

diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets
@@ -136,7 +136,7 @@ IF NOT "%CrossGen2SynthesizePgo"=="" (
 
  <BatchCLRTestExitCodePrep Condition="$(_CLRTestNeedsToRun)">
  <![CDATA[
-if not defined CLRTestExpectedExitCode (set CLRTestExpectedExitCode=$(CLRTestExitCode))
+set CLRTestExpectedExitCode=$(CLRTestExitCode)
 ECHO BEGIN EXECUTION
  ]]>
  </BatchCLRTestExitCodePrep>

diff --git a/src/tests/Directory.Merged.props b/src/tests/Directory.Merged.props
@@ -28,6 +28,6 @@
  Directory.Build.targets is typically too late as SDK .targets files will have already
  been processed and may have used the value.
  -->
- <AssemblyName Condition="'$(BuildAsStandalone)' != 'true'">$(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', ''))</AssemblyName>
+ <AssemblyName Condition="'$(BuildAsStandalone)' != 'true'">$(MSBuildProjectName.Replace('_il_do', '').Replace('_il_d', '').Replace('_il_ro', '').Replace('_il_r', ''))</AssemblyName>
  </PropertyGroup>
 </Project>
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.cs b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.cs
@@ -3,15 +3,13 @@
 
 
 using System;
-using Xunit;
 
 
 namespace N
 {
-public class X
+internal class X
  {
- [Fact]
- public static void TestEntryPoint()
+ public static void Main(String[] args)
  {
  }
  }

diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <CLRTestPriority>1</CLRTestPriority>
+
+ <!-- The test is an empty Main method, so explicitly don't reference the generator
+ and run it as an executable -->
+ <RequiresProcessIsolation>true</RequiresProcessIsolation>
+ <ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
  </PropertyGroup>
  <PropertyGroup>
  <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->

diff --git a/src/tests/JIT/jit64/Directory.Build.props b/src/tests/JIT/jit64/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+ <Import Project="..\..\Directory.Merged.props" />
+ <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+
+ <PropertyGroup>
+ <RunAnalyzers>true</RunAnalyzers>
+ <EnableNETAnalyzers>false</EnableNETAnalyzers>
+ </PropertyGroup>
+</Project>
diff --git a/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.cs b/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Xunit;
 internal class MCell<T>
 {
  private T _t;
@@ -29,9 +30,10 @@ internal class MPair<R, S> : MCell<R>
  public MPair(R r, S s) : base(r) { _s = s; }
 }
 
-internal class M
+public class M
 {
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
  {
  MCell<int> c = new MCell<int>(1);
  MPair<int, string> p = c.GetMPair<string>("2");

diff --git a/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj b/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.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/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.cs b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Program
+public class Program
 {
 
  private static TestUtil.TestLog testLog;
@@ -24,7 +25,7 @@ static Program()
  testLog = new TestUtil.TestLog(expectedOut);
  }
 
-public static void Test(int count)
+internal static void Test(int count)
  {
  try
  {
@@ -54,7 +55,8 @@ public static void Test(int count)
  }
  }
 
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
  {
  // start recording
  testLog.StartRecording();

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.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/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.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/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.cs b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Program
+public class Program
 {
 
  private static TestUtil.TestLog testLog;
@@ -24,7 +25,7 @@ static Program()
  testLog = new TestUtil.TestLog(expectedOut);
  }
 
-public static void Test(int count)
+internal static void Test(int count)
  {
  try
  {
@@ -53,7 +54,8 @@ public static void Test(int count)
  }
  }
 
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
  {
  // start recording
  testLog.StartRecording();

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.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/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.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/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.cs b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Xunit;
 
-class Program
+public class Program
 {
 
  private static TestUtil.TestLog testLog;
@@ -29,7 +30,7 @@ static Program()
  testLog = new TestUtil.TestLog(expectedOut);
  }
 
-public static void Test(int count)
+internal static void Test(int count)
  {
  try
  {
@@ -76,7 +77,8 @@ public static void Test(int count)
  }
  }
 
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
  {
  // start recording
  testLog.StartRecording();

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.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/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.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/jit64/eh/FinallyExec/nonlocalexitincatch.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.il
@@ -8,14 +8,18 @@
  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
  .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitincatch.exe
+.assembly 'nonlocalexitincatch' {}
 
 
+.class public auto ansi nonlocalexitincatch {
 .method public static int32 Main()
 {
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
  .entrypoint
  .maxstack 2
  .locals init (
@@ -61,6 +65,7 @@
 
  ret
 }
+}
 
 
 .method public static void Run()

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.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/jit64/eh/FinallyExec/nonlocalexitinfinally.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.il
@@ -8,14 +8,18 @@
  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
  .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitinfinally.exe
+.assembly 'nonlocalexitinfinally' {}
 
 
+.class public auto ansi nonlocalexitinfinally {
 .method public static int32 Main()
 {
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
  .entrypoint
  .maxstack 2
  .locals init (
@@ -61,6 +65,7 @@
 
  ret
 }
+}
 
 
 .method public static void Run()

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.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/jit64/eh/FinallyExec/nonlocalexitinhandler.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.il
@@ -8,14 +8,18 @@
  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
  .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitinhandler.exe
+.assembly 'nonlocalexitinhandler' {}
 
 
+.class public auto ansi nonlocalexitinhandler {
 .method public static int32 Main()
 {
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
  .entrypoint
  .maxstack 2
  .locals init (
@@ -64,6 +68,7 @@
 
  ret
 }
+}
 
 
 .method public static void Run()

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.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/jit64/eh/FinallyExec/nonlocalexitinroot.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.il
@@ -8,14 +8,18 @@
  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
  .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitinroot.exe
+.assembly 'nonlocalexitinroot' {}
 
 
+.class public auto ansi nonlocalexitinroot {
 .method public static int32 Main()
 {
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
  .entrypoint
  .maxstack 2
  .locals init (
@@ -55,6 +59,7 @@
 
  ret
 }
+}
 
 
 .method public static void Run()

diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.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/jit64/eh/FinallyExec/nonlocalexitintry.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.il
@@ -8,14 +8,18 @@
  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
  .ver 4:0:0:0
 }
+.assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitintry.exe
+.assembly 'nonlocalexitintry' {}
 
 
+.class public auto ansi nonlocalexitintry {
 .method public static int32 Main()
 {
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
  .entrypoint
  .maxstack 2
  .locals init (
@@ -61,6 +65,7 @@
 
  ret
 }
+}
 
 
 .method public static void Run()