Gluing and propagating custom AssemblyLoadContext through the higher API levels.

hrumhurum · hrumhurum · commit e71073995eb8 · 2021-08-19T14:06:43.000+03:00
diff --git a/src/Dotnet.Script.Core/Commands/ExecuteCodeCommand.cs b/src/Dotnet.Script.Core/Commands/ExecuteCodeCommand.cs
@@ -23,7 +23,12 @@ public async Task<TReturn> Execute<TReturn>(ExecuteCodeCommandOptions options)
             var sourceText = SourceText.From(options.Code);
             var context = new ScriptContext(sourceText, options.WorkingDirectory ?? Directory.GetCurrentDirectory(), options.Arguments, null, options.OptimizationLevel, ScriptMode.Eval, options.PackageSources);
             var compiler = GetScriptCompiler(!options.NoCache, _logFactory);
-            var runner = new ScriptRunner(compiler, _logFactory, _scriptConsole);
+            var runner = new ScriptRunner(compiler, _logFactory, _scriptConsole)
+            {
+#if NETCOREAPP
+                AssemblyLoadContext = options.AssemblyLoadContext
+#endif
+            };
             return await runner.Execute<TReturn>(context);
         }
 
diff --git a/src/Dotnet.Script.Core/Commands/ExecuteCodeCommandOptions.cs b/src/Dotnet.Script.Core/Commands/ExecuteCodeCommandOptions.cs
@@ -1,4 +1,7 @@
 using Microsoft.CodeAnalysis;
+#if NETCOREAPP
+using System.Runtime.Loader;
+#endif
 
 namespace Dotnet.Script.Core.Commands
 {
@@ -20,5 +23,14 @@ public ExecuteCodeCommandOptions(string code, string workingDirectory, string[]
         public OptimizationLevel OptimizationLevel { get; }
         public bool NoCache { get; }
         public string[] PackageSources { get; }
+
+#if NETCOREAPP
+#nullable enable
+        /// <summary>
+        /// Gets or sets a custom assembly load context to use for script execution.
+        /// </summary>
+        public AssemblyLoadContext? AssemblyLoadContext { get; init; }
+#nullable restore
+#endif
     }
 }
diff --git a/src/Dotnet.Script.Core/Commands/ExecuteLibraryCommand.cs b/src/Dotnet.Script.Core/Commands/ExecuteLibraryCommand.cs
@@ -26,7 +26,12 @@ public async Task<TReturn> Execute<TReturn>(ExecuteLibraryCommandOptions options
 
             var absoluteFilePath = options.LibraryPath.GetRootedPath();
             var compiler = GetScriptCompiler(!options.NoCache, _logFactory);
-            var runner = new ScriptRunner(compiler, _logFactory, _scriptConsole);
+            var runner = new ScriptRunner(compiler, _logFactory, _scriptConsole)
+            {
+#if NETCOREAPP
+                AssemblyLoadContext = options.AssemblyLoadContext
+#endif
+            };
             var result = await runner.Execute<TReturn>(absoluteFilePath, options.Arguments);
             return result;
         }
diff --git a/src/Dotnet.Script.Core/Commands/ExecuteLibraryCommandOptions.cs b/src/Dotnet.Script.Core/Commands/ExecuteLibraryCommandOptions.cs
@@ -1,3 +1,7 @@
+#if NETCOREAPP
+using System.Runtime.Loader;
+#endif
+
 namespace Dotnet.Script.Core.Commands
 {
     public class ExecuteLibraryCommandOptions
@@ -12,5 +16,14 @@ public ExecuteLibraryCommandOptions(string libraryPath, string[] arguments, bool
         public string LibraryPath { get; }
         public string[] Arguments { get; }
         public bool NoCache { get; }
+
+#if NETCOREAPP
+#nullable enable
+        /// <summary>
+        /// Gets or sets a custom assembly load context to use for script execution.
+        /// </summary>
+        public AssemblyLoadContext? AssemblyLoadContext { get; init; }
+#nullable restore
+#endif
     }
 }
diff --git a/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs b/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
@@ -32,7 +32,14 @@ public async Task<TReturn> Run<TReturn, THost>(ExecuteScriptCommandOptions optio
             }
 
             var pathToLibrary = GetLibrary(options);
-            return await ExecuteLibrary<TReturn>(pathToLibrary, options.Arguments, options.NoCache);
+
+            var libraryOptions = new ExecuteLibraryCommandOptions(pathToLibrary, options.Arguments, options.NoCache)
+            {
+#if NETCOREAPP
+                AssemblyLoadContext = options.AssemblyLoadContext
+#endif
+            };
+            return await new ExecuteLibraryCommand(_scriptConsole, _logFactory).Execute<TReturn>(libraryOptions);
         }
 
         private async Task<TReturn> DownloadAndRunCode<TReturn>(ExecuteScriptCommandOptions executeOptions)
@@ -124,11 +131,5 @@ public bool TryGetHash(string cacheFolder, out string hash)
             hash = File.ReadAllText(pathToHashFile);
             return true;
         }
-
-        private async Task<TReturn> ExecuteLibrary<TReturn>(string pathToLibrary, string[] arguments, bool noCache)
-        {
-            var options = new ExecuteLibraryCommandOptions(pathToLibrary, arguments, noCache);
-            return await new ExecuteLibraryCommand(_scriptConsole, _logFactory).Execute<TReturn>(options);
-        }
     }
 }
diff --git a/src/Dotnet.Script.Core/Commands/ExecuteScriptCommandOptions.cs b/src/Dotnet.Script.Core/Commands/ExecuteScriptCommandOptions.cs
@@ -1,4 +1,7 @@
 using Microsoft.CodeAnalysis;
+#if NETCOREAPP
+using System.Runtime.Loader;
+#endif
 
 namespace Dotnet.Script.Core.Commands
 {
@@ -20,5 +23,14 @@ public ExecuteScriptCommandOptions(ScriptFile file, string[] arguments, Optimiza
         public string[] PackageSources { get; }
         public bool IsInteractive { get; }
         public bool NoCache { get; }
+
+#if NETCOREAPP
+#nullable enable
+        /// <summary>
+        /// Gets or sets a custom assembly load context to use for script execution.
+        /// </summary>
+        public AssemblyLoadContext? AssemblyLoadContext { get; init; }
+#nullable restore
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,14 @@ public async Task<TReturn> Run<TReturn, THost>(ExecuteScriptCommandOptions optio`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`var pathToLibrary = GetLibrary(options);`
`35`		`- return await ExecuteLibrary<TReturn>(pathToLibrary, options.Arguments, options.NoCache);`
	`35`	`+`
	`36`	`+ var libraryOptions = new ExecuteLibraryCommandOptions(pathToLibrary, options.Arguments, options.NoCache)`
	`37`	`+ {`
	`38`	`+#if NETCOREAPP`
	`39`	`+ AssemblyLoadContext = options.AssemblyLoadContext`
	`40`	`+#endif`
	`41`	`+ };`
	`42`	`+ return await new ExecuteLibraryCommand(_scriptConsole, _logFactory).Execute<TReturn>(libraryOptions);`
`36`	`43`	`}`
`37`	`44`
`38`	`45`	`private async Task<TReturn> DownloadAndRunCode<TReturn>(ExecuteScriptCommandOptions executeOptions)`
`@@ -124,11 +131,5 @@ public bool TryGetHash(string cacheFolder, out string hash)`
`124`	`131`	`hash = File.ReadAllText(pathToHashFile);`
`125`	`132`	`return true;`
`126`	`133`	`}`
`127`		`-`
`128`		`- private async Task<TReturn> ExecuteLibrary<TReturn>(string pathToLibrary, string[] arguments, bool noCache)`
`129`		`- {`
`130`		`- var options = new ExecuteLibraryCommandOptions(pathToLibrary, arguments, noCache);`
`131`		`- return await new ExecuteLibraryCommand(_scriptConsole, _logFactory).Execute<TReturn>(options);`
`132`		`- }`
`133`	`134`	`}`
`134`	`135`	`}`