AssemblyLoadPal is used instead of AppDomain in order to cover both AppDomain and AssemblyLoadContext scenarios.

hrumhurum · hrumhurum · commit f1907e1627be · 2021-08-18T21:44:20.000+03:00
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -23,6 +23,7 @@
     <EmbeddedResource Include="**/*.template" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Gapotchenko.FX.Reflection.Loader" Version="2021.2.6-beta" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ReadLine" Version="2.0.1" />
diff --git a/src/Dotnet.Script.Core/ScriptRunner.cs b/src/Dotnet.Script.Core/ScriptRunner.cs
@@ -7,6 +7,7 @@
 using Dotnet.Script.DependencyModel.Environment;
 using Dotnet.Script.DependencyModel.Logging;
 using Dotnet.Script.DependencyModel.Runtime;
+using Gapotchenko.FX.Reflection;
 using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting;
 using Microsoft.CodeAnalysis.Scripting;
 using Microsoft.CodeAnalysis.Scripting.Hosting;
@@ -30,13 +31,15 @@ public ScriptRunner(ScriptCompiler scriptCompiler, LogFactory logFactory, Script
 
         public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string> commandLineArgs)
         {
+            var assemblyLoaderPal = AssemblyLoadPal.ForCurrentAppDomain;
+
             var runtimeDeps = ScriptCompiler.RuntimeDependencyResolver.GetDependenciesForLibrary(dllPath);
             var runtimeDepsMap = ScriptCompiler.CreateScriptDependenciesMap(runtimeDeps);
-            var assembly = Assembly.LoadFrom(dllPath); // this needs to be called prior to 'AppDomain.CurrentDomain.AssemblyResolve' event handler added
+            var assembly = assemblyLoaderPal.LoadFrom(dllPath); // this needs to be called prior to 'AppDomain.CurrentDomain.AssemblyResolve' event handler added
 
-            Assembly OnResolve(object sender, ResolveEventArgs args) => ResolveAssembly(args, runtimeDepsMap);
+            Assembly OnResolve(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args) => ResolveAssembly(sender, args, runtimeDepsMap);
 
-            AppDomain.CurrentDomain.AssemblyResolve += OnResolve;
+            assemblyLoaderPal.Resolving += OnResolve;
             try
             {
                 var type = assembly.GetType("Submission#0");
@@ -64,7 +67,7 @@ public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string>
             }
             finally
             {
-                AppDomain.CurrentDomain.AssemblyResolve -= OnResolve;
+                assemblyLoaderPal.Resolving -= OnResolve;
             }
         }
 
@@ -97,12 +100,11 @@ public virtual async Task<TReturn> Execute<TReturn, THost>(ScriptCompilationCont
             return ProcessScriptState(scriptResult);
         }
 
-        internal Assembly ResolveAssembly(ResolveEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)
+        internal Assembly ResolveAssembly(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)
         {
-            var assemblyName = new AssemblyName(args.Name);
-            var result = runtimeDepsMap.TryGetValue(assemblyName.Name, out RuntimeAssembly runtimeAssembly);
+            var result = runtimeDepsMap.TryGetValue(args.Name.Name, out RuntimeAssembly runtimeAssembly);
             if (!result) return null;
-            var loadedAssembly = Assembly.LoadFrom(runtimeAssembly.Path);
+            var loadedAssembly = sender.LoadFrom(runtimeAssembly.Path);
             return loadedAssembly;
         }
 
diff --git a/src/Dotnet.Script.Tests/ScriptRunnerTests.cs b/src/Dotnet.Script.Tests/ScriptRunnerTests.cs
@@ -3,6 +3,7 @@
 using Dotnet.Script.Core;
 using Dotnet.Script.DependencyModel.Runtime;
 using Dotnet.Script.Shared.Tests;
+using Gapotchenko.FX.Reflection;
 using Moq;
 using Xunit;
 
@@ -15,7 +16,7 @@ public void ResolveAssembly_ReturnsNull_WhenRuntimeDepsMapDoesNotContainAssembly
         {
             var scriptRunner = CreateScriptRunner();
 
-            var result = scriptRunner.ResolveAssembly(new ResolveEventArgs("AnyAssemblyName"), new Dictionary<string, RuntimeAssembly>());
+            var result = scriptRunner.ResolveAssembly(AssemblyLoadPal.ForCurrentAppDomain, new AssemblyLoadPal.ResolvingEventArgs(null, "AnyAssemblyName"), new Dictionary<string, RuntimeAssembly>());
 
             Assert.Null(result);
         }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Dotnet.Script.DependencyModel.Environment;`
`8`	`8`	`using Dotnet.Script.DependencyModel.Logging;`
`9`	`9`	`using Dotnet.Script.DependencyModel.Runtime;`
	`10`	`+using Gapotchenko.FX.Reflection;`
`10`	`11`	`using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting;`
`11`	`12`	`using Microsoft.CodeAnalysis.Scripting;`
`12`	`13`	`using Microsoft.CodeAnalysis.Scripting.Hosting;`
`@@ -30,13 +31,15 @@ public ScriptRunner(ScriptCompiler scriptCompiler, LogFactory logFactory, Script`
`30`	`31`
`31`	`32`	`public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string> commandLineArgs)`
`32`	`33`	`{`
	`34`	`+ var assemblyLoaderPal = AssemblyLoadPal.ForCurrentAppDomain;`
	`35`	`+`
`33`	`36`	`var runtimeDeps = ScriptCompiler.RuntimeDependencyResolver.GetDependenciesForLibrary(dllPath);`
`34`	`37`	`var runtimeDepsMap = ScriptCompiler.CreateScriptDependenciesMap(runtimeDeps);`
`35`		`- var assembly = Assembly.LoadFrom(dllPath); // this needs to be called prior to 'AppDomain.CurrentDomain.AssemblyResolve' event handler added`
	`38`	`+ var assembly = assemblyLoaderPal.LoadFrom(dllPath); // this needs to be called prior to 'AppDomain.CurrentDomain.AssemblyResolve' event handler added`
`36`	`39`
`37`		`- Assembly OnResolve(object sender, ResolveEventArgs args) => ResolveAssembly(args, runtimeDepsMap);`
	`40`	`+ Assembly OnResolve(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args) => ResolveAssembly(sender, args, runtimeDepsMap);`
`38`	`41`
`39`		`- AppDomain.CurrentDomain.AssemblyResolve += OnResolve;`
	`42`	`+ assemblyLoaderPal.Resolving += OnResolve;`
`40`	`43`	`try`
`41`	`44`	`{`
`42`	`45`	`var type = assembly.GetType("Submission#0");`
`@@ -64,7 +67,7 @@ public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string>`
`64`	`67`	`}`
`65`	`68`	`finally`
`66`	`69`	`{`
`67`		`- AppDomain.CurrentDomain.AssemblyResolve -= OnResolve;`
	`70`	`+ assemblyLoaderPal.Resolving -= OnResolve;`
`68`	`71`	`}`
`69`	`72`	`}`
`70`	`73`
`@@ -97,12 +100,11 @@ public virtual async Task<TReturn> Execute<TReturn, THost>(ScriptCompilationCont`
`97`	`100`	`return ProcessScriptState(scriptResult);`
`98`	`101`	`}`
`99`	`102`
`100`		`- internal Assembly ResolveAssembly(ResolveEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)`
	`103`	`+ internal Assembly ResolveAssembly(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)`
`101`	`104`	`{`
`102`		`- var assemblyName = new AssemblyName(args.Name);`
`103`		`- var result = runtimeDepsMap.TryGetValue(assemblyName.Name, out RuntimeAssembly runtimeAssembly);`
	`105`	`+ var result = runtimeDepsMap.TryGetValue(args.Name.Name, out RuntimeAssembly runtimeAssembly);`
`104`	`106`	`if (!result) return null;`
`105`		`- var loadedAssembly = Assembly.LoadFrom(runtimeAssembly.Path);`
	`107`	`+ var loadedAssembly = sender.LoadFrom(runtimeAssembly.Path);`
`106`	`108`	`return loadedAssembly;`
`107`	`109`	`}`
`108`	`110`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Dotnet.Script.Core;`
`4`	`4`	`using Dotnet.Script.DependencyModel.Runtime;`
`5`	`5`	`using Dotnet.Script.Shared.Tests;`
	`6`	`+using Gapotchenko.FX.Reflection;`
`6`	`7`	`using Moq;`
`7`	`8`	`using Xunit;`
`8`	`9`
`@@ -15,7 +16,7 @@ public void ResolveAssembly_ReturnsNull_WhenRuntimeDepsMapDoesNotContainAssembly`
`15`	`16`	`{`
`16`	`17`	`var scriptRunner = CreateScriptRunner();`
`17`	`18`
`18`		`- var result = scriptRunner.ResolveAssembly(new ResolveEventArgs("AnyAssemblyName"), new Dictionary<string, RuntimeAssembly>());`
	`19`	`+ var result = scriptRunner.ResolveAssembly(AssemblyLoadPal.ForCurrentAppDomain, new AssemblyLoadPal.ResolvingEventArgs(null, "AnyAssemblyName"), new Dictionary<string, RuntimeAssembly>());`
`19`	`20`
`20`	`21`	`Assert.Null(result);`
`21`	`22`	`}`