Merge pull request #21 from fbayon/feature/netcore2

Fixed assembly load and remove console.writeline as log

Author: viferga

source/loaders/cs_loader/netcore/source/Loader.cs

@@ -16,7 +16,41 @@ namespace CSLoader
 {
     public class Loader
     {
+    [System.Diagnostics.Conditional("DEBUG_FILE")]
+    private static void Log(string text){
 
+    var message= $"{DateTime.Now.Ticks}: {text}\n";
+    System.IO.File.AppendAllText("log.txt", message);
+    }
+    
+    private static Assembly MyResolveEventHandler(object sender, ResolveEventArgs args)
+    {
+        Assembly asm = null;
+        Log("MyResolveEventHandler" + paths.Count.ToString());
+            foreach (var path in paths)
+            {
+                try
+                {
+                    var p =path + "\\" + args.Name + ".dll";
+                    Log(p);
+
+                    asm = Assembly.LoadFile(p);
+                    if (asm != null)
+                    {
+                        return asm;
+                    }else{
+                        Log("NULL");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log("EX! " + ex.Message);
+                    
+                }
+            }
+
+            return asm;
+    }
         public static void Main(string[] args)
         {
 
@@ -26,7 +60,9 @@ public static void Main(string[] args)
 
         static Loader()
         {
-            AssemblyLoadContext.Default.Resolving += Context_Resolving;
+            Log("start");
+            AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler);
+            AppDomain.CurrentDomain.TypeResolve+= new ResolveEventHandler(MyResolveEventHandler);
             Init();
         }
 
@@ -74,7 +110,6 @@ public static ReflectFunction[] GetFunctionsInternal()
         {
             return loader.Functions();
         }
-
         public static void GetFunctions(ref int count, IntPtr p)
         {
             var f = loader.Functions();
@@ -189,11 +224,14 @@ public bool LoadFromSourceFunctions(string[] source)
 
             string assemblyName = Path.GetRandomFileName();
 
-            MetadataReference[] references = new MetadataReference[]
-            {
-                MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(typeof(Enumerable).GetTypeInfo().Assembly.Location)
-            };
+            MetadataReference[] references;
+            
+            var mainPath = Path.GetDirectoryName( typeof(object).GetTypeInfo().Assembly.Location) +"/";
+            var assemblyFiles = System.IO.Directory.GetFiles(mainPath,"*.dll");
+
+            assemblyFiles = assemblyFiles.Concat(System.IO.Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory,"*.dll")).Distinct().ToArray();
+
+            references = assemblyFiles.Select(x=> MetadataReference.CreateFromFile(x)).ToArray();
 
             CSharpCompilation compilation = CSharpCompilation.Create(
                 assemblyName,
@@ -213,15 +251,13 @@ public bool LoadFromSourceFunctions(string[] source)
 
                     foreach (Diagnostic diagnostic in failures)
                     {
-                        Console.Error.WriteLine("{0}: {1}", diagnostic.Id, diagnostic.GetMessage());
+                        Log($"{diagnostic.Id}: {diagnostic.GetMessage()}");
                     }
                 }
                 else
                 {
                     ms.Seek(0, SeekOrigin.Begin);
-
-                    AssemblyLoadContext context = AssemblyLoadContext.Default;
-                    assembly = context.LoadFromStream(ms);
+                       assembly = Assembly.Load(ms.ToArray());
                 }
             }
 
@@ -240,7 +276,6 @@ public bool LoadFromSourceFunctions(string[] source)
 
         public static bool LoadFromAssembly(string assemblyFile)
         {
-            AssemblyLoadContext context = AssemblyLoadContext.Default;
             Assembly asm = null;
 
             string path = System.IO.Path.GetDirectoryName(assemblyFile);
@@ -252,7 +287,7 @@ public static bool LoadFromAssembly(string assemblyFile)
 
             try
             {
-                asm = context.LoadFromAssemblyPath(assemblyFile);
+                asm =Assembly.LoadFile(assemblyFile);
             }
             catch (Exception)
             {
@@ -261,7 +296,7 @@ public static bool LoadFromAssembly(string assemblyFile)
             {
                 try
                 {
-                    asm = context.LoadFromAssemblyName(new AssemblyName(System.IO.Path.GetFileNameWithoutExtension(assemblyFile)));
+                    asm = Assembly.Load(new AssemblyName(System.IO.Path.GetFileNameWithoutExtension(assemblyFile)));
                 }
                 catch (Exception)
                 {
@@ -283,30 +318,6 @@ public static bool LoadFromAssembly(string assemblyFile)
             return false;
         }
 
-        private static Assembly Context_Resolving(AssemblyLoadContext context, AssemblyName name)
-        {
-            Assembly asm = null;
-
-            foreach (var path in paths)
-            {
-                try
-                {
-                    asm = context.LoadFromAssemblyPath(path + "\\" + name.Name + ".dll");
-
-                    if (asm != null)
-                    {
-                        return asm;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Console.Error.WriteLine(ex.Message);
-                }
-            }
-
-            return asm;
-        }
-
         public static bool LoadFromAssemblyC([System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPWStr)] string assemblyFile)
         {
             return LoadFromAssembly(assemblyFile);
@@ -377,7 +388,7 @@ public void LoadFunctions(Assembly assembly)
             }
             catch (Exception ex)
             {
-                Console.Error.WriteLine(ex.Message);
+                Log(ex.Message);
             }
 
             return null;

source/loaders/cs_loader/netcore/source/project.csproj

@@ -6,13 +6,11 @@
     <VersionPrefix>1.0.0</VersionPrefix>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RuntimeFrameworkVersion>1.0.3</RuntimeFrameworkVersion>
-    <AssetTargetFallback>$(AssetTargetFallback);dnxcore50;</AssetTargetFallback>
+  
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
   </ItemGroup>
 
 </Project>