Enabled assembly isolation for interactive script execution.

hrumhurum · hrumhurum · commit fad86f6e624c · 2021-08-20T22:26:54.000+03:00
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
@@ -11,6 +11,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Runtime.Loader;
 using System.Threading.Tasks;
 
 namespace Dotnet.Script
@@ -247,7 +248,7 @@ private static int Wain(string[] args)
                         nocache.HasValue()
                     )
                     {
-                        AssemblyLoadContext = new ScriptAssemblyLoadContext()
+                        AssemblyLoadContext = CreateAssemblyLoadContext()
                     };
 
                     var fileCommand = new ExecuteScriptCommand(ScriptConsole.Default, logFactory);
@@ -265,16 +266,24 @@ private static int Wain(string[] args)
 
         private static async Task<int> RunInteractive(bool useRestoreCache, LogFactory logFactory, string[] packageSources)
         {
-            var options = new ExecuteInteractiveCommandOptions(null, Array.Empty<string>(), packageSources);
+            var options = new ExecuteInteractiveCommandOptions(null, Array.Empty<string>(), packageSources)
+            {
+                AssemblyLoadContext = CreateAssemblyLoadContext()
+            };
             await new ExecuteInteractiveCommand(ScriptConsole.Default, logFactory).Execute(options);
             return 0;
         }
 
         private async static Task<int> RunInteractiveWithSeed(string file, LogFactory logFactory, string[] arguments, string[] packageSources)
         {
-            var options = new ExecuteInteractiveCommandOptions(new ScriptFile(file), arguments, packageSources);
+            var options = new ExecuteInteractiveCommandOptions(new ScriptFile(file), arguments, packageSources)
+            {
+                AssemblyLoadContext = CreateAssemblyLoadContext()
+            };
             await new ExecuteInteractiveCommand(ScriptConsole.Default, logFactory).Execute(options);
             return 0;
         }
+
+        static AssemblyLoadContext CreateAssemblyLoadContext() => new ScriptAssemblyLoadContext();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using System.IO;`
`12`	`12`	`using System.Linq;`
`13`	`13`	`using System.Runtime.InteropServices;`
	`14`	`+using System.Runtime.Loader;`
`14`	`15`	`using System.Threading.Tasks;`
`15`	`16`
`16`	`17`	`namespace Dotnet.Script`
`@@ -247,7 +248,7 @@ private static int Wain(string[] args)`
`247`	`248`	`nocache.HasValue()`
`248`	`249`	`)`
`249`	`250`	`{`
`250`		`- AssemblyLoadContext = new ScriptAssemblyLoadContext()`
	`251`	`+ AssemblyLoadContext = CreateAssemblyLoadContext()`
`251`	`252`	`};`
`252`	`253`
`253`	`254`	`var fileCommand = new ExecuteScriptCommand(ScriptConsole.Default, logFactory);`
`@@ -265,16 +266,24 @@ private static int Wain(string[] args)`
`265`	`266`
`266`	`267`	`private static async Task<int> RunInteractive(bool useRestoreCache, LogFactory logFactory, string[] packageSources)`
`267`	`268`	`{`
`268`		`- var options = new ExecuteInteractiveCommandOptions(null, Array.Empty<string>(), packageSources);`
	`269`	`+ var options = new ExecuteInteractiveCommandOptions(null, Array.Empty<string>(), packageSources)`
	`270`	`+ {`
	`271`	`+ AssemblyLoadContext = CreateAssemblyLoadContext()`
	`272`	`+ };`
`269`	`273`	`await new ExecuteInteractiveCommand(ScriptConsole.Default, logFactory).Execute(options);`
`270`	`274`	`return 0;`
`271`	`275`	`}`
`272`	`276`
`273`	`277`	`private async static Task<int> RunInteractiveWithSeed(string file, LogFactory logFactory, string[] arguments, string[] packageSources)`
`274`	`278`	`{`
`275`		`- var options = new ExecuteInteractiveCommandOptions(new ScriptFile(file), arguments, packageSources);`
	`279`	`+ var options = new ExecuteInteractiveCommandOptions(new ScriptFile(file), arguments, packageSources)`
	`280`	`+ {`
	`281`	`+ AssemblyLoadContext = CreateAssemblyLoadContext()`
	`282`	`+ };`
`276`	`283`	`await new ExecuteInteractiveCommand(ScriptConsole.Default, logFactory).Execute(options);`
`277`	`284`	`return 0;`
`278`	`285`	`}`
	`286`	`+`
	`287`	`+ static AssemblyLoadContext CreateAssemblyLoadContext() => new ScriptAssemblyLoadContext();`
`279`	`288`	`}`
`280`	`289`	`}`