Convert all remaining tests in the Loader subtree to the merged model

src/tests/Directory.Build.targets

@@ -35,7 +35,7 @@
   <!-- Default priority building values. -->
   <PropertyGroup>
     <DisableProjectBuild Condition="'$(IsMergedTestRunnerAssembly)' == 'true' and $(BuildAsStandalone)">true</DisableProjectBuild>
-    <OutputType Condition="('$(IsMergedTestRunnerAssembly)' == 'true' and !$(BuildAsStandalone)) or '$(RequiresProcessIsolation)' == 'true'">Exe</OutputType>
+    <OutputType Condition="('$(IsMergedTestRunnerAssembly)' == 'true' and !$(BuildAsStandalone)) or ('$(RequiresProcessIsolation)' == 'true' and '$(CLRTestKind)' != 'SharedLibrary')">Exe</OutputType>
 
     <CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Exe'">BuildAndRun</CLRTestKind>
     <CLRTestKind Condition="'$(CLRTestKind)' == ''">SharedLibrary</CLRTestKind>

src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.cs

@@ -9,7 +9,7 @@
 
 namespace AssemblyDependencyResolverTests
 {
-    class AssemblyDependencyResolverTests : TestBase
+    public class AssemblyDependencyResolverTests : TestBase
     {
         string _componentDirectory;
         string _componentAssemblyPath;
@@ -306,7 +306,8 @@ private string CreateMockStandardNativeLibrary(string relativePath, string simpl
                 relativePath + Path.DirectorySeparatorChar + XPlatformUtils.GetStandardNativeLibraryFileName(simpleName));
         }
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             return TestBase.RunTests(
                 typeof(AssemblyDependencyResolverTests),

src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for NativeAotIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <RequiresMockHostPolicy>true</RequiresMockHostPolicy>
     <!-- AssemblyDependencyResolver is not supported -->
     <NativeAotIncompatible>true</NativeAotIncompatible>

src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/TestBase.cs

@@ -7,7 +7,7 @@
 
 namespace AssemblyDependencyResolverTests
 {
-    class TestBase
+    public class TestBase
     {
         protected string TestBasePath { get; private set; }
         protected string BinaryBasePath { get; private set; }

src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/InvalidHostingTest.cs

@@ -7,9 +7,10 @@
 
 namespace AssemblyDependencyResolverTests
 {
-    class InvalidHostingTest
+    public class InvalidHostingTest
     {
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             try
             {

src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.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>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>

src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.cs

@@ -8,8 +8,9 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
+using Xunit;
 
-class Program
+public class Program
 {
     class TestALC : AssemblyLoadContext
     {
@@ -25,7 +26,8 @@ protected override Assembly Load(AssemblyName name)
         }
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         var holdResult = HoldAssembliesAliveThroughByRefFields(out GCHandle gch1, out GCHandle gch2);
         if (holdResult != 100)
@@ -90,7 +92,7 @@ private static ReadOnlySpan<byte> LoadAssembly(out GCHandle gchToAssembly)
     {
         var currentALC = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly());
         var alc = new TestALC(currentALC);
-        var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Unloaded.dll"));
+        var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "ByRefLocalsUnloaded.dll"));
         gchToAssembly = GCHandle.Alloc(a, GCHandleType.WeakTrackResurrection);
 
         var spanAccessor = (IReturnSpan)Activator.CreateInstance(a.GetType("SpanAccessor"));

src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for GC.WaitForPendingFinalizers -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="Unloaded.csproj" />
+    <ProjectReference Include="ByRefLocalsUnloaded.csproj" />
     <ProjectReference Include="SpanAccessor.csproj" />
     <Compile Include="ByRefLocals.cs" />
   </ItemGroup>

src/tests/Loader/CollectibleAssemblies/ByRefLocals/Unloaded.csproj → src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocalsUnloaded.csproj

@@ -5,6 +5,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="SpanAccessor.csproj" />
-    <Compile Include="Unloaded.cs" />
+    <Compile Include="ByRefLocalsUnloaded.cs" />
   </ItemGroup>
 </Project>

src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.cs

@@ -14,6 +14,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.IO;
+using Xunit;
 
 class TestAssemblyLoadContext : AssemblyLoadContext
 {
@@ -31,7 +32,7 @@ protected override Assembly Load(AssemblyName assemblyName)
         {
             AssemblyLoadContext alc1 = new AssemblyLoadContext("Dependencies", true);
             Console.WriteLine($"Loading TestInterface by alc {alc1} for {(IsCollectible ? "collectible" : "non-collectible")} alc {this}");
-            Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestInterface", "TestInterface.dll")));
+            Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestInterface", "TestInterface.dll")));
             interfaceAssemblyRef = new WeakReference(a);
             return a;
         }
@@ -40,7 +41,7 @@ protected override Assembly Load(AssemblyName assemblyName)
     }
 }
 
-class Test
+public class Test
 {
     static AssemblyLoadContext alc1 = null;
     static WeakReference interfaceAssemblyRef = null;
@@ -56,7 +57,7 @@ private static Assembly LoadUsingResolvingEvent(bool collectibleParent)
         alc1 = new AssemblyLoadContext("Dependencies", true);
         AssemblyLoadContext alc2 = new AssemblyLoadContext("Test1", collectibleParent);
         alc2.Resolving += Alc2_Resolving;
-        Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestClass", "TestClass.dll")));
+        Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestClass", "TestClass.dll")));
 
         Type t = assembly.GetType("TestClass.Class");
         Console.WriteLine($"Type {t} obtained");
@@ -76,7 +77,7 @@ private static Assembly Alc2_Resolving(AssemblyLoadContext arg1, AssemblyName ar
         if (alc1 != null && arg2.Name == "TestInterface")
         {
             Console.WriteLine($"Loading TestInterface by alc {alc1} for {(arg1.IsCollectible ? "collectible" : "non-collectible")} alc {arg1}");
-            Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestInterface", "TestInterface.dll")));
+            Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestInterface", "TestInterface.dll")));
             interfaceAssemblyRef = new WeakReference(a);
             return a;
         }
@@ -88,7 +89,7 @@ private static Assembly Alc2_Resolving(AssemblyLoadContext arg1, AssemblyName ar
     private static Assembly LoadUsingLoadOverride(bool collectibleParent)
     {
         TestAssemblyLoadContext alc2 = new TestAssemblyLoadContext("Test2", collectibleParent);
-        Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestClass", "TestClass.dll")));
+        Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestClass", "TestClass.dll")));
 
         Type t = assembly.GetType("TestClass.Class");
 
@@ -206,7 +207,8 @@ private static int TestFullUnload(TestCase testCase)
         return 100;
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int status = 100;
         foreach (TestCase testCase in Enum.GetValues(typeof(TestCase)))

src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.csproj

@@ -1,11 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible, GC.WaitForPendingFinalizers -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Test creates non-collectible AssemblyLoadContext -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ResolvedFromDifferentContext.cs" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="TestInterface.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="TestClass.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TestClassOutputPath>$(OutputPath)/../TestClass</TestClassOutputPath>
+    <TestInterfaceOutputPath>$(OutputPath)/../TestInterface</TestInterfaceOutputPath>
+  </PropertyGroup>
+
+  <Target Name="CopySupportAssembliesToOutputSubfolders" AfterTargets="Build">
+    <MakeDir Directories="$(TestClassOutputPath);$(TestInterfaceOutputPath)" />
+    <Copy SourceFiles="$(TestClassOutputPath)/TestClass.dll" DestinationFolder="$(OutputPath)/TestClass" />
+    <Copy SourceFiles="$(TestInterfaceOutputPath)/TestInterface.dll" DestinationFolder="$(OutputPath)/TestInterface" />
+  </Target>
+
 </Project>

src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.cs

@@ -8,8 +8,9 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
+using Xunit;
 
-class Program
+public class Program
 {
     class TestALC : AssemblyLoadContext
     {
@@ -25,11 +26,12 @@ protected override Assembly Load(AssemblyName name)
         }
     }
 
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         var currentALC = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly());
         var alc = new TestALC(currentALC);
-        var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Unloaded.dll"));
+        var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "StaticsUnloaded.dll"));
 
         var accessor = (IStaticTest)Activator.CreateInstance(a.GetType("StaticTest"));
         accessor.SetStatic(12759, 548739, 5468, 8518, 9995);

src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="Unloaded.csproj" />
+    <ProjectReference Include="StaticsUnloaded.csproj" />
     <ProjectReference Include="Accessor.csproj" />
     <Compile Include="CollectibleStatics.cs" />
   </ItemGroup>

src/tests/Loader/CollectibleAssemblies/Statics/Unloaded.csproj → src/tests/Loader/CollectibleAssemblies/Statics/StaticsUnloaded.csproj

@@ -5,6 +5,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="Accessor.csproj" />
-    <Compile Include="Unloaded.cs" />
+    <Compile Include="StaticsUnloaded.cs" />
   </ItemGroup>
 </Project>

src/tests/Loader/ContextualReflection/ContextualReflection.cs

@@ -23,23 +23,22 @@ class MockAssembly : Assembly
         public MockAssembly() {}
     }
 
-    class Program : IProgram
+    public class Program : IProgram
     {
         public AssemblyLoadContext alc { get; set; }
         public Assembly alcAssembly { get; set; }
         public Type alcProgramType { get; set; }
         public IProgram alcProgramInstance { get; set; }
         public Assembly defaultAssembly { get; set; }
 
-        public static int Main()
+        [Fact]
+        public static void TestEntryPoint()
         {
             Program program = new Program(isolated:false);
 
             program.RunTests();
 
             Console.WriteLine("Success");
-
-            return 100;
         }
 
         public Program()
@@ -84,7 +83,7 @@ void VerifyIsolationDefault()
             VerifyIsolation();
             Assert.Equal(defaultAssembly, Assembly.GetExecutingAssembly());
             Assert.Equal(AssemblyLoadContext.Default, AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()));
-            Assert.NotEqual(alcProgramType, typeof(Program));
+            Assert.NotEqual(typeof(Program), alcProgramType);
             Assert.NotEqual((object)alcProgramInstance, (object)this);
         }
 
@@ -93,7 +92,7 @@ void VerifyIsolationAlc()
             VerifyIsolation();
             Assert.Equal(alcAssembly, Assembly.GetExecutingAssembly());
             Assert.Equal(alc, AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()));
-            Assert.Equal(alcProgramType, typeof(Program));
+            Assert.Equal(typeof(Program), alcProgramType);
             Assert.Equal((object)alcProgramInstance, (object)this);
         }
 
@@ -286,7 +285,7 @@ void VerifyBadContextualReflectionUsage()
                 try
                 {
                     IDisposable defaultScope = AssemblyLoadContext.EnterContextualReflection(null);
-                    Assert.Equal(null, AssemblyLoadContext.CurrentContextualReflectionContext);
+                    Assert.Null(AssemblyLoadContext.CurrentContextualReflectionContext);
 
                     throw new InvalidOperationException();
                 }
@@ -738,7 +737,7 @@ void TestDefineDynamicAssembly(bool collectibleContext, AssemblyBuilderAccess as
 
             AssemblyLoadContext context = AssemblyLoadContext.GetLoadContext(assemblyBuilder);
             Assert.Equal(assemblyLoadContext, context);
-            Assert.True(assemblyLoadContext.Assemblies.Any(a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyBuilder.GetName())));
+            Assert.Contains(assemblyLoadContext.Assemblies, a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyBuilder.GetName()));
         }
 
         void TestMockAssemblyThrows()

src/tests/Loader/ContextualReflection/ContextualReflection.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- The test uses AssemblyLoadContext (directly) to load the test assembly and its dependency that's part of the test again.
     When the test is loaded into an unloadable context in the runincontext tool, the dependency assembly cannot be found
     since it is in a different folder than the runincontext tool.  -->

src/tests/Loader/CustomAttributes/DynamicObjects.cs

@@ -12,18 +12,19 @@
 namespace DynamicObjects {
     public class M {
         public const string ObjectRequiredMessage = "some string";
-        public static int Main() {
+        [Fact]
+        public static void TestEntryPoint()
+        {
             var instance = createObject();
             var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();
 
             Assert.True(attrs.Count() == 2);
-            Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
-            Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
+            Assert.Equal("System.ComponentModel.DataAnnotations.DisplayAttribute", attrs.ElementAt(0).ToString());
+            Assert.Equal("System.ComponentModel.DataAnnotations.RequiredAttribute", attrs.ElementAt(1).ToString());
             Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
             Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));
 
             Console.WriteLine("Success");
-            return 100;
         }
 
         public static object createObject () {

src/tests/Loader/CustomAttributes/DynamicObjects.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>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />

src/tests/Loader/Directory.Build.props

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Merged.props', $(MSBuildThisFileDirectory)..))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <RunAnalyzers>true</RunAnalyzers>
+    <NoWarn>$(NoWarn);xUnit1013</NoWarn>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
+</Project>

src/tests/Loader/Loader.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="*/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="$(MSBuildProjectName).csproj" />
+    <MergedWrapperProjectReference Remove="classloader/generics/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="classloader/regressions/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="classloader/TypeGeneratorTests/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="classloader/StaticVirtualMethods/GenericContext/Generator/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="classloader/StaticVirtualMethods/TypeHierarchy/Generator/**/*.??proj" />
+  </ItemGroup>
+
+  <Import Project="$(TestSourceDir)MergedTestRunner.targets" />
+</Project>