ScriptRunner refactoring related to AssemblyLoadContext support.

hrumhurum · hrumhurum · commit 11e800cb2745 · 2021-08-19T11:09:11.000+03:00
diff --git a/src/Dotnet.Script.Core/ScriptRunner.cs b/src/Dotnet.Script.Core/ScriptRunner.cs
@@ -45,18 +45,18 @@ public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string>
         {
 #if NETCOREAPP
             var assemblyLoadContext = AssemblyLoadContext;
-            var assemblyLoaderPal = assemblyLoadContext != null ? new AssemblyLoadPal(assemblyLoadContext) : AssemblyLoadPal.ForCurrentAppDomain;
+            var assemblyLoadPal = assemblyLoadContext != null ? new AssemblyLoadPal(assemblyLoadContext) : AssemblyLoadPal.ForCurrentAppDomain;
 #else
-            var assemblyLoaderPal = AssemblyLoadPal.ForCurrentAppDomain;            
+            var assemblyLoadPal = AssemblyLoadPal.ForCurrentAppDomain;            
 #endif
 
             var runtimeDeps = ScriptCompiler.RuntimeDependencyResolver.GetDependenciesForLibrary(dllPath);
             var runtimeDepsMap = ScriptCompiler.CreateScriptDependenciesMap(runtimeDeps);
-            var assembly = assemblyLoaderPal.LoadFrom(dllPath); // this needs to be called prior to 'AppDomain.CurrentDomain.AssemblyResolve' event handler added
+            var assembly = assemblyLoadPal.LoadFrom(dllPath); // this needs to be called prior to 'AssemblyLoadPal.Resolving' event handler added
 
             Assembly OnResolve(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args) => ResolveAssembly(sender, args, runtimeDepsMap);
 
-            assemblyLoaderPal.Resolving += OnResolve;
+            assemblyLoadPal.Resolving += OnResolve;
             try
             {
                 var type = assembly.GetType("Submission#0");
@@ -84,7 +84,7 @@ public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string>
             }
             finally
             {
-                assemblyLoaderPal.Resolving -= OnResolve;
+                assemblyLoadPal.Resolving -= OnResolve;
             }
         }
 
@@ -117,11 +117,11 @@ public virtual async Task<TReturn> Execute<TReturn, THost>(ScriptCompilationCont
             return ProcessScriptState(scriptResult);
         }
 
-        internal Assembly ResolveAssembly(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)
+        internal Assembly ResolveAssembly(AssemblyLoadPal pal, AssemblyLoadPal.ResolvingEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)
         {
             var result = runtimeDepsMap.TryGetValue(args.Name.Name, out RuntimeAssembly runtimeAssembly);
             if (!result) return null;
-            var loadedAssembly = sender.LoadFrom(runtimeAssembly.Path);
+            var loadedAssembly = pal.LoadFrom(runtimeAssembly.Path);
             return loadedAssembly;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -45,18 +45,18 @@ public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string>`
`45`	`45`	`{`
`46`	`46`	`#if NETCOREAPP`
`47`	`47`	`var assemblyLoadContext = AssemblyLoadContext;`
`48`		`- var assemblyLoaderPal = assemblyLoadContext != null ? new AssemblyLoadPal(assemblyLoadContext) : AssemblyLoadPal.ForCurrentAppDomain;`
	`48`	`+ var assemblyLoadPal = assemblyLoadContext != null ? new AssemblyLoadPal(assemblyLoadContext) : AssemblyLoadPal.ForCurrentAppDomain;`
`49`	`49`	`#else`
`50`		`- var assemblyLoaderPal = AssemblyLoadPal.ForCurrentAppDomain;`
	`50`	`+ var assemblyLoadPal = AssemblyLoadPal.ForCurrentAppDomain;`
`51`	`51`	`#endif`
`52`	`52`
`53`	`53`	`var runtimeDeps = ScriptCompiler.RuntimeDependencyResolver.GetDependenciesForLibrary(dllPath);`
`54`	`54`	`var runtimeDepsMap = ScriptCompiler.CreateScriptDependenciesMap(runtimeDeps);`
`55`		`- var assembly = assemblyLoaderPal.LoadFrom(dllPath); // this needs to be called prior to 'AppDomain.CurrentDomain.AssemblyResolve' event handler added`
	`55`	`+ var assembly = assemblyLoadPal.LoadFrom(dllPath); // this needs to be called prior to 'AssemblyLoadPal.Resolving' event handler added`
`56`	`56`
`57`	`57`	`Assembly OnResolve(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args) => ResolveAssembly(sender, args, runtimeDepsMap);`
`58`	`58`
`59`		`- assemblyLoaderPal.Resolving += OnResolve;`
	`59`	`+ assemblyLoadPal.Resolving += OnResolve;`
`60`	`60`	`try`
`61`	`61`	`{`
`62`	`62`	`var type = assembly.GetType("Submission#0");`
`@@ -84,7 +84,7 @@ public async Task<TReturn> Execute<TReturn>(string dllPath, IEnumerable<string>`
`84`	`84`	`}`
`85`	`85`	`finally`
`86`	`86`	`{`
`87`		`- assemblyLoaderPal.Resolving -= OnResolve;`
	`87`	`+ assemblyLoadPal.Resolving -= OnResolve;`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -117,11 +117,11 @@ public virtual async Task<TReturn> Execute<TReturn, THost>(ScriptCompilationCont`
`117`	`117`	`return ProcessScriptState(scriptResult);`
`118`	`118`	`}`
`119`	`119`
`120`		`- internal Assembly ResolveAssembly(AssemblyLoadPal sender, AssemblyLoadPal.ResolvingEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)`
	`120`	`+ internal Assembly ResolveAssembly(AssemblyLoadPal pal, AssemblyLoadPal.ResolvingEventArgs args, Dictionary<string, RuntimeAssembly> runtimeDepsMap)`
`121`	`121`	`{`
`122`	`122`	`var result = runtimeDepsMap.TryGetValue(args.Name.Name, out RuntimeAssembly runtimeAssembly);`
`123`	`123`	`if (!result) return null;`
`124`		`- var loadedAssembly = sender.LoadFrom(runtimeAssembly.Path);`
	`124`	`+ var loadedAssembly = pal.LoadFrom(runtimeAssembly.Path);`
`125`	`125`	`return loadedAssembly;`
`126`	`126`	`}`
`127`	`127`