Start to use ALC

Author: aromaa

Core/Data/TestProjectData.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.Runtime.Loader;
 using System.Text;
 using TestMyCode.CSharp.API.Attributes;
 
@@ -21,9 +24,23 @@ public TestProjectData()
 
         public void LoadProject(string assemblyPath)
         {
-            //I would prefer using AssemblyLoadContext but then xUnit can't find the assembly
-            //xUnit only accepts assembly location and not the assembly itself
-            Assembly assembly = Assembly.LoadFrom(assemblyPath);
+            AssemblyLoadContext alc = new AssemblyLoadContext("TestProjectLoader", isCollectible: true);
+
+            alc.Resolving += (sender, args) =>
+            {
+                string assemblyName = $"{args.Name}.dll";
+                string dir = Path.GetDirectoryName(assemblyPath)!;
+
+                string assemblyFile = Path.Combine(dir, assemblyName);
+                if (File.Exists(assemblyFile))
+                {
+                    return sender.LoadFromAssemblyPath(assemblyFile);
+                }
+
+                return null;
+            };
+
+            Assembly assembly = alc.LoadFromAssemblyPath(assemblyPath);
 
             this.LoadAssembly(assembly);
         }

Core/Test/ProjectTestRunner.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.Loader;
 using System.Text;
 using System.Threading;
 using TestMyCode.CSharp.Core.Data;
@@ -33,10 +34,10 @@ public void RunAssemblies(IReadOnlyList<Assembly> assemblies)
 
         public void RunAssemblyTests(Assembly assembly)
         {
-            using ManualResetEvent testsCompled = new ManualResetEvent(false);
-            using AssemblyRunner runner = AssemblyRunner.WithoutAppDomain(assembly.Location);
+            using AssemblyLoadContext.ContextualReflectionScope scope = AssemblyLoadContext.EnterContextualReflection(assembly);
 
-            AppDomain.CurrentDomain.AssemblyResolve += this.CreateTestAssemblyResolver(assembly);
+            using ManualResetEvent testsCompleted = new ManualResetEvent(false);
+            using AssemblyRunner runner = AssemblyRunner.WithoutAppDomain(assembly.Location);
 
             runner.OnTestFailed += info =>
             {
@@ -52,39 +53,20 @@ public void RunAssemblyTests(Assembly assembly)
 
             runner.OnExecutionComplete += info =>
             {
-                testsCompled.Set();
+                testsCompleted.Set();
             };
 
             //This is non blocking call!
             runner.Start();
 
             //We don't want to exit before all of the tests have ran
             //This will be signaled once all of the tests have been ran
-            testsCompled.WaitOne();
+            testsCompleted.WaitOne();
 
             //OnExecutionComplete is invoked before setting the Status so spin here until it changes
             SpinWait.SpinUntil(() => runner.Status == AssemblyRunnerStatus.Idle);
         }
 
-        private ResolveEventHandler CreateTestAssemblyResolver(Assembly assembly)
-        {
-            return (sender, args) =>
-            {
-                AssemblyName name = new AssemblyName(args.Name!);
-
-                string assemblyName = $"{name.Name}.dll";
-                string dir = Path.GetDirectoryName(assembly.Location)!;
-
-                string assemblyFile = Path.Combine(dir, assemblyName);
-                if (File.Exists(assemblyFile))
-                {
-                    return Assembly.LoadFile(assemblyFile);
-                }
-
-                return null;
-            };
-        }
-
         private void AddTestResult(MethodTestResult result)
         {
             //We lock here to ensure that we don't have any race conditions