Fix native dll loading

Author: FabianTerhorst

Dockerfile

@@ -33,6 +33,8 @@ RUN cd AltV.Net.Chat && dotnet publish -c Release
 #FROM debian:stable
 FROM ubuntu:18.04
 
+COPY --from=dotnet /usr/share/dotnet /usr/share/dotnet
+
 RUN apt-get update
 RUN apt-get install -y apt-utils
 RUN apt-get install -y libc6-i386
@@ -50,6 +52,9 @@ COPY start.sh .
 COPY startgdb.sh .
 COPY libnode.so.64 .
 COPY libnode-module.so modules/
+
+COPY csharp-module.dll resources/example/2csharp-module.dll
+
 COPY resource.cfg resources/example/
 COPY --from=dotnet /altv-example/AltV.Net.Chat/resource.cfg resources/chat/
 COPY data/ ./data
@@ -58,7 +63,6 @@ COPY --from=clang /runtime/build/src/libcsharp-module.so modules/
 COPY --from=dotnet /altv-example/AltV.Net.Example/bin/Release/netcoreapp3.0/publish resources/example/
 COPY --from=dotnet /altv-example/AltV.Net.Chat/bin/Release/netcoreapp3.0/publish resources/chat/
 COPY --from=dotnet /altv-example/AltV.Net.Host/bin/Release/netcoreapp3.0/publish .
-COPY --from=dotnet /usr/share/dotnet /usr/share/dotnet
 RUN ls -l
 RUN chmod +x ./altv-server
 

api/AltV.Net.Host/Host.cs

@@ -46,7 +46,7 @@ public static int ExecuteResource(IntPtr arg, int argLength)
             var resourceMain = Marshal.PtrToStringUTF8(libArgs.ResourceMain);
 
             var resourceDllPath = GetPath(resourcePath, resourceMain);
-            var resourceAssemblyLoadContext = new ResourceAssemblyLoadContext(resourceDllPath, resourceName);
+            var resourceAssemblyLoadContext = new ResourceAssemblyLoadContext(resourceDllPath, resourcePath, resourceName);
 
             Assembly resourceAssembly;
 

api/AltV.Net.Host/ResourceAssemblyLoadContext.cs

@@ -11,10 +11,14 @@ public class ResourceAssemblyLoadContext : AssemblyLoadContext
 
         private readonly string resourceName;
 
-        public ResourceAssemblyLoadContext(string resourcePath, string resourceName) : base(resourceName)
+        private readonly string resourcePath;
+
+        public ResourceAssemblyLoadContext(string resourceDllPath, string resourcePath, string resourceName) : base(resourceName,
+            true)
         {
-            resolver = new AssemblyDependencyResolver(resourcePath);
+            resolver = new AssemblyDependencyResolver(resourceDllPath);
             this.resourceName = resourceName;
+            this.resourcePath = resourcePath;
         }
 
         protected override Assembly Load(AssemblyName assemblyName)
@@ -25,10 +29,23 @@ protected override Assembly Load(AssemblyName assemblyName)
 
         protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
         {
-            var libraryPath = resolver.ResolveUnmanagedDllToPath(unmanagedDllName) ??
-                              resolver.ResolveUnmanagedDllToPath(
-                                  "resources" + Path.DirectorySeparatorChar + resourceName +
-                                  Path.DirectorySeparatorChar + unmanagedDllName);
+            var libraryPath = resolver.ResolveUnmanagedDllToPath(unmanagedDllName);
+
+            if (libraryPath == null)
+            {
+                var dllPath = resourcePath + Path.DirectorySeparatorChar + unmanagedDllName;
+                if (File.Exists(dllPath))
+                {
+                    try
+                    {
+                        return LoadUnmanagedDllFromPath(dllPath);
+                    }
+                    catch (Exception exception)
+                    {
+                        Console.WriteLine(exception);
+                    }
+                }
+            }
 
             return libraryPath != null ? LoadUnmanagedDllFromPath(libraryPath) : IntPtr.Zero;
         }

api/AltV.Net/ModuleWrapper.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.Loader;
 using AltV.Net.Elements.Args;