Merge pull request dotnet-script#224 from SlowLogicBoy/master

filipw · web-flow · commit b20b599564d0 · 2018-02-16T08:23:21.000+01:00
Remove dependency on System.Runtime.Loader.
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -36,7 +36,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 
diff --git a/src/Dotnet.Script.Core/ScriptCompiler.cs b/src/Dotnet.Script.Core/ScriptCompiler.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Runtime.Loader;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Microsoft.CodeAnalysis.Scripting;
@@ -134,8 +133,8 @@ public virtual ScriptCompilationContext<TReturn> CreateCompilationContext<TRetur
                 }
             }
 
-            AssemblyLoadContext.Default.Resolving +=
-                (assemblyLoadContext, assemblyName) => MapUnresolvedAssemblyToRuntimeLibrary(dependencyMap, assemblyLoadContext, assemblyName);
+            AppDomain.CurrentDomain.AssemblyResolve += 
+                (sender, args) => MapUnresolvedAssemblyToRuntimeLibrary(dependencyMap, args);
 
             // when processing raw code, make sure we inject new lines after preprocessor directives
             string code;
@@ -164,14 +163,15 @@ public virtual ScriptCompilationContext<TReturn> CreateCompilationContext<TRetur
             return new ScriptCompilationContext<TReturn>(script, context.Code, loader, opts);
         }
 
-        private Assembly MapUnresolvedAssemblyToRuntimeLibrary(IDictionary<string, RuntimeAssembly> dependencyMap, AssemblyLoadContext loadContext, AssemblyName assemblyName)
+        private Assembly MapUnresolvedAssemblyToRuntimeLibrary(IDictionary<string, RuntimeAssembly> dependencyMap, ResolveEventArgs args)
         {
+            var assemblyName = new AssemblyName(args.Name);
             if (dependencyMap.TryGetValue(assemblyName.Name, out var runtimeAssembly))
             {
                 if (runtimeAssembly.Name.Version > assemblyName.Version)
                 {
                     Logger.Log($"Redirecting {assemblyName} to {runtimeAssembly.Name}");                    
-                    return loadContext.LoadFromAssemblyPath(runtimeAssembly.Path);
+                    return Assembly.LoadFile(runtimeAssembly.Path);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using System.Runtime.InteropServices;`
`7`		`-using System.Runtime.Loader;`
`8`	`7`	`using Microsoft.CodeAnalysis;`
`9`	`8`	`using Microsoft.CodeAnalysis.CSharp.Scripting;`
`10`	`9`	`using Microsoft.CodeAnalysis.Scripting;`
`@@ -134,8 +133,8 @@ public virtual ScriptCompilationContext<TReturn> CreateCompilationContext<TRetur`
`134`	`133`	`}`
`135`	`134`	`}`
`136`	`135`
`137`		`- AssemblyLoadContext.Default.Resolving +=`
`138`		`- (assemblyLoadContext, assemblyName) => MapUnresolvedAssemblyToRuntimeLibrary(dependencyMap, assemblyLoadContext, assemblyName);`
	`136`	`+ AppDomain.CurrentDomain.AssemblyResolve +=`
	`137`	`+ (sender, args) => MapUnresolvedAssemblyToRuntimeLibrary(dependencyMap, args);`
`139`	`138`
`140`	`139`	`// when processing raw code, make sure we inject new lines after preprocessor directives`
`141`	`140`	`string code;`
`@@ -164,14 +163,15 @@ public virtual ScriptCompilationContext<TReturn> CreateCompilationContext<TRetur`
`164`	`163`	`return new ScriptCompilationContext<TReturn>(script, context.Code, loader, opts);`
`165`	`164`	`}`
`166`	`165`
`167`		`- private Assembly MapUnresolvedAssemblyToRuntimeLibrary(IDictionary<string, RuntimeAssembly> dependencyMap, AssemblyLoadContext loadContext, AssemblyName assemblyName)`
	`166`	`+ private Assembly MapUnresolvedAssemblyToRuntimeLibrary(IDictionary<string, RuntimeAssembly> dependencyMap, ResolveEventArgs args)`
`168`	`167`	`{`
	`168`	`+ var assemblyName = new AssemblyName(args.Name);`
`169`	`169`	`if (dependencyMap.TryGetValue(assemblyName.Name, out var runtimeAssembly))`
`170`	`170`	`{`
`171`	`171`	`if (runtimeAssembly.Name.Version > assemblyName.Version)`
`172`	`172`	`{`
`173`	`173`	`Logger.Log($"Redirecting {assemblyName} to {runtimeAssembly.Name}");`
`174`		`- return loadContext.LoadFromAssemblyPath(runtimeAssembly.Path);`
	`174`	`+ return Assembly.LoadFile(runtimeAssembly.Path);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`