Removed LoadLibrary hack on windows

seesharper · seesharper · commit 6ec895bbb769 · 2018-10-27T15:48:29.000+02:00
diff --git a/src/Dotnet.Script.Core/ScriptCompiler.cs b/src/Dotnet.Script.Core/ScriptCompiler.cs
@@ -3,7 +3,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Dotnet.Script.Core.Internal;
@@ -24,10 +23,6 @@ namespace Dotnet.Script.Core
 {
     public class ScriptCompiler
     {
-        // Note: Windows only, Mac and Linux needs something else?
-        [DllImport("Kernel32.dll")]
-        private static extern IntPtr LoadLibrary(string path);
-
         private ScriptEnvironment _scriptEnvironment;
 
         private Logger _logger;
@@ -120,8 +115,6 @@ public virtual ScriptCompilationContext<TReturn> CreateCompilationContext<TRetur
 
             scriptOptions = AddScriptReferences(scriptOptions, loadedAssembliesMap, scriptDependenciesMap);
 
-            LoadNativeAssets(runtimeDependencies);
-
             AppDomain.CurrentDomain.AssemblyResolve +=
                 (sender, args) => MapUnresolvedAssemblyToRuntimeLibrary(scriptDependenciesMap, loadedAssembliesMap, args);
 
@@ -150,17 +143,6 @@ private RuntimeDependency[] GetRuntimeDependencies(ScriptContext context)
             }
         }
 
-        private void LoadNativeAssets(RuntimeDependency[] runtimeDependencies)
-        {
-            foreach (var nativeAsset in runtimeDependencies.SelectMany(rtd => rtd.NativeAssets).Distinct())
-            {
-                if (_scriptEnvironment.IsWindows)
-                {
-                    LoadLibrary(nativeAsset);
-                }
-            }
-        }
-
         private ScriptOptions AddScriptReferences(ScriptOptions scriptOptions, Dictionary<string, Assembly> loadedAssembliesMap, Dictionary<string, RuntimeAssembly> scriptDependenciesMap)
         {
             foreach (var runtimeAssembly in scriptDependenciesMap.Values)
diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -129,11 +129,15 @@ private string CreateScriptAssembly<TReturn, THost>(ScriptContext context, strin
 
                 foreach (var runtimeDependency in emitResult.RuntimeDependencies)
                 {
-                    foreach (var nativeAsset in runtimeDependency.NativeAssets)
+                    if (!runtimeDependency.Name.Contains("microsoft.netcore", StringComparison.OrdinalIgnoreCase))
                     {
-                        if (!runtimeDependency.Name.Contains("microsoft.netcore", StringComparison.OrdinalIgnoreCase))
+                        foreach (var nativeAsset in runtimeDependency.NativeAssets)
                         {
-                            File.Copy(nativeAsset,Path.Combine(outputDirectory, Path.GetFileName(nativeAsset)), true);
+                            File.Copy(nativeAsset, Path.Combine(outputDirectory, Path.GetFileName(nativeAsset)), true);
+                        }
+                        foreach (var runtimeAssembly in runtimeDependency.Assemblies)
+                        {
+                            File.Copy(runtimeAssembly.Path, Path.Combine(outputDirectory, Path.GetFileName(runtimeAssembly.Path)), true);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -129,11 +129,15 @@ private string CreateScriptAssembly<TReturn, THost>(ScriptContext context, strin`
`129`	`129`
`130`	`130`	`foreach (var runtimeDependency in emitResult.RuntimeDependencies)`
`131`	`131`	`{`
`132`		`- foreach (var nativeAsset in runtimeDependency.NativeAssets)`
	`132`	`+ if (!runtimeDependency.Name.Contains("microsoft.netcore", StringComparison.OrdinalIgnoreCase))`
`133`	`133`	`{`
`134`		`- if (!runtimeDependency.Name.Contains("microsoft.netcore", StringComparison.OrdinalIgnoreCase))`
	`134`	`+ foreach (var nativeAsset in runtimeDependency.NativeAssets)`
`135`	`135`	`{`
`136`		`- File.Copy(nativeAsset,Path.Combine(outputDirectory, Path.GetFileName(nativeAsset)), true);`
	`136`	`+ File.Copy(nativeAsset, Path.Combine(outputDirectory, Path.GetFileName(nativeAsset)), true);`
	`137`	`+ }`
	`138`	`+ foreach (var runtimeAssembly in runtimeDependency.Assemblies)`
	`139`	`+ {`
	`140`	`+ File.Copy(runtimeAssembly.Path, Path.Combine(outputDirectory, Path.GetFileName(runtimeAssembly.Path)), true);`
`137`	`141`	`}`
`138`	`142`	`}`
`139`	`143`	`}`