Improve assembly loading

Author: FabianTerhorst

api/AltV.Net.Host/Host.cs

@@ -8,8 +8,9 @@ namespace AltV.Net.Host
 {
     public class Host
     {
-        private static IDictionary<string, ResourceAssemblyLoadContext> _loadContexts = new Dictionary<string, ResourceAssemblyLoadContext>();
-        
+        private static IDictionary<string, ResourceAssemblyLoadContext> _loadContexts =
+            new Dictionary<string, ResourceAssemblyLoadContext>();
+
         /// <summary>
         /// Main is present to execute the dll as a assembly
         /// </summary>
@@ -45,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);
+            var resourceAssemblyLoadContext = new ResourceAssemblyLoadContext(resourceDllPath, resourceName);
 
             Assembly resourceAssembly;
 

api/AltV.Net.Host/ResourceAssemblyLoadContext.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Reflection;
 using System.Runtime.Loader;
 
@@ -8,9 +9,12 @@ public class ResourceAssemblyLoadContext : AssemblyLoadContext
     {
         private readonly AssemblyDependencyResolver resolver;
 
-        public ResourceAssemblyLoadContext(string resourcePath)
+        private readonly string resourceName;
+
+        public ResourceAssemblyLoadContext(string resourcePath, string resourceName) : base(resourceName)
         {
             resolver = new AssemblyDependencyResolver(resourcePath);
+            this.resourceName = resourceName;
         }
 
         protected override Assembly Load(AssemblyName assemblyName)
@@ -21,7 +25,11 @@ protected override Assembly Load(AssemblyName assemblyName)
 
         protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
         {
-            var libraryPath = resolver.ResolveUnmanagedDllToPath(unmanagedDllName);
+            Console.WriteLine("unmanaged:" + unmanagedDllName);
+            var libraryPath = resolver.ResolveUnmanagedDllToPath(unmanagedDllName) ??
+                              resolver.ResolveUnmanagedDllToPath(
+                                  resourceName + Path.DirectorySeparatorChar + unmanagedDllName);
+
             return libraryPath != null ? LoadUnmanagedDllFromPath(libraryPath) : IntPtr.Zero;
         }
     }

api/AltV.Net.Mock/MockAltV.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.Loader;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Net.Mock
@@ -34,7 +35,7 @@ public MockAltV(string entryPoint)
             var server = new MockServer(IntPtr.Zero, baseObjectPool, entityPool, playerPool, vehiclePool, blipPool,
                 checkpointPool, voiceChannelPool);
             var cSharpNativeResource = new CSharpNativeResource(IntPtr.Zero);
-            var module = resource.GetModule(server, cSharpNativeResource, baseObjectPool, entityPool, playerPool,
+            var module = resource.GetModule(server, AssemblyLoadContext.Default, cSharpNativeResource, baseObjectPool, entityPool, playerPool,
                 vehiclePool, blipPool, checkpointPool, voiceChannelPool, colShapePool);
             resource.OnStart();
         }

api/AltV.Net/IResource.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.Loader;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Net
@@ -36,7 +37,9 @@ IBaseBaseObjectPool GetBaseBaseObjectPool(IEntityPool<IPlayer> playerPool, IEnti
         IBaseObjectFactory<IVoiceChannel> GetVoiceChannelFactory();
         IBaseObjectFactory<IColShape> GetColShapeFactory();
 
-        Module GetModule(IServer server, CSharpNativeResource cSharpNativeResource,
+        Module GetModule(IServer server,
+            AssemblyLoadContext assemblyLoadContext,
+            CSharpNativeResource cSharpNativeResource,
             IBaseBaseObjectPool baseBaseObjectPool,
             IBaseEntityPool baseEntityPool,
             IEntityPool<IPlayer> playerPool,

api/AltV.Net/Module.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Runtime.Loader;
 using AltV.Net.Elements.Args;
 using AltV.Net.Elements.Entities;
 using AltV.Net.Events;
@@ -15,6 +16,8 @@ public class Module
     {
         internal readonly IServer Server;
 
+        internal readonly AssemblyLoadContext AssemblyLoadContext;
+        
         internal readonly CSharpNativeResource CSharpNativeResource;
 
         internal readonly IBaseBaseObjectPool BaseBaseObjectPool;
@@ -106,7 +109,7 @@ public class Module
 
         internal readonly IDictionary<string, Function> functionExports = new Dictionary<string, Function>();
 
-        public Module(IServer server, CSharpNativeResource cSharpNativeResource, IBaseBaseObjectPool baseBaseObjectPool,
+        public Module(IServer server, AssemblyLoadContext assemblyLoadContext, CSharpNativeResource cSharpNativeResource, IBaseBaseObjectPool baseBaseObjectPool,
             IBaseEntityPool baseEntityPool, IEntityPool<IPlayer> playerPool,
             IEntityPool<IVehicle> vehiclePool,
             IBaseObjectPool<IBlip> blipPool,
@@ -116,6 +119,7 @@ public Module(IServer server, CSharpNativeResource cSharpNativeResource, IBaseBa
         {
             Alt.Init(this);
             Server = server;
+            AssemblyLoadContext = assemblyLoadContext;
             CSharpNativeResource = cSharpNativeResource;
             BaseBaseObjectPool = baseBaseObjectPool;
             BaseEntityPool = baseEntityPool;

api/AltV.Net/ModuleWrapper.cs

@@ -23,7 +23,8 @@ public static void Main(IntPtr serverPointer, IntPtr resourcePointer, string res
         {
             var assemblyLoader = new AssemblyLoader();
             MainWithResource(serverPointer, resourcePointer,
-                new ResourceLoader(serverPointer, assemblyLoader, resourceName, entryPoint).Init());
+                new ResourceLoader(serverPointer, assemblyLoader, resourceName, entryPoint).Init(),
+                AssemblyLoadContext.Default);
             _scripts = new ScriptLoader(assemblyLoader).GetAllScripts();
             _module.OnScriptsLoaded(_scripts);
             _resource.OnStart();
@@ -43,14 +44,15 @@ public static void MainWithAssembly(IntPtr serverPointer, IntPtr resourcePointer
                 return;
             }
 
-            MainWithResource(serverPointer, resourcePointer, resource);
+            MainWithResource(serverPointer, resourcePointer, resource, assemblyLoadContext);
             //TODO: set delegates here
             _scripts = AssemblyLoader.FindAllTypes<IScript>(assemblyLoadContext.Assemblies);
             _module.OnScriptsLoaded(_scripts);
             ResourceBuilder.SetDelegates(resourcePointer, OnStartResource);
         }
 
-        public static void MainWithResource(IntPtr serverPointer, IntPtr resourcePointer, IResource resource)
+        public static void MainWithResource(IntPtr serverPointer, IntPtr resourcePointer, IResource resource,
+            AssemblyLoadContext assemblyLoadContext)
         {
             Console.WriteLine("before resource:" + (_resource == null));
             _resource = resource;
@@ -78,7 +80,7 @@ public static void MainWithResource(IntPtr serverPointer, IntPtr resourcePointer
             var server = new Server(serverPointer, baseObjectPool, entityPool, playerPool, vehiclePool, blipPool,
                 checkpointPool, voiceChannelPool, colShapePool);
             var csharpResource = new CSharpNativeResource(resourcePointer);
-            _module = _resource.GetModule(server, csharpResource, baseObjectPool, entityPool, playerPool, vehiclePool,
+            _module = _resource.GetModule(server, assemblyLoadContext, csharpResource, baseObjectPool, entityPool, playerPool, vehiclePool,
                 blipPool, checkpointPool, voiceChannelPool, colShapePool);
             AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
         }

api/AltV.Net/Resource.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.Loader;
 using AltV.Net.Elements.Entities;
 using AltV.Net.Elements.Factories;
 using AltV.Net.Elements.Pools;
@@ -96,14 +97,16 @@ public virtual IBaseObjectFactory<IColShape> GetColShapeFactory()
             return new ColShapeFactory();
         }
 
-        public virtual Module GetModule(IServer server, CSharpNativeResource cSharpNativeResource,
+        public virtual Module GetModule(IServer server, 
+            AssemblyLoadContext assemblyLoadContext,
+            CSharpNativeResource cSharpNativeResource,
             IBaseBaseObjectPool baseBaseObjectPool,
             IBaseEntityPool baseEntityPool, IEntityPool<IPlayer> playerPool, IEntityPool<IVehicle> vehiclePool,
             IBaseObjectPool<IBlip> blipPool,
             IBaseObjectPool<ICheckpoint> checkpointPool, IBaseObjectPool<IVoiceChannel> voiceChannelPool,
             IBaseObjectPool<IColShape> colShapePool)
         {
-            return new Module(server, cSharpNativeResource, baseBaseObjectPool, baseEntityPool, playerPool, vehiclePool,
+            return new Module(server, assemblyLoadContext, cSharpNativeResource, baseBaseObjectPool, baseEntityPool, playerPool, vehiclePool,
                 blipPool, checkpointPool, voiceChannelPool, colShapePool);
         }
     }