Improve assembly resolution speed

Author: FabianTerhorst

api/AltV.Net.Async/AltV.Net.Async.csproj

@@ -12,9 +12,9 @@
         <RepositoryUrl>https://github.com/altmp-csharp/docs</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>altv gta bridge</PackageTags>
-        <PackageVersion>1.13.0</PackageVersion>
+        <PackageVersion>1.13.1</PackageVersion>
         <PackageLicenseFile>license.txt</PackageLicenseFile>
-        <PackageReleaseNotes></PackageReleaseNotes>
+        <PackageReleaseNotes>Fix multi async resources</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

api/AltV.Net.Host/ResourceAssemblyLoadContext.cs

@@ -9,56 +9,51 @@ public class ResourceAssemblyLoadContext : AssemblyLoadContext
     {
         private readonly AssemblyDependencyResolver resolver;
 
-        private readonly string resourcePath;
-
         public ResourceAssemblyLoadContext(string resourceDllPath, string resourcePath, string resourceName) : base(resourceName,
             true)
         {
             resolver = new AssemblyDependencyResolver(resourceDllPath);
-            this.resourcePath = resourcePath;
+            Resolving += (context, assemblyName) =>
+            {
+                var dllPath = resourcePath + Path.DirectorySeparatorChar + assemblyName.Name;
+                if (!File.Exists(dllPath)) return null;
+                try
+                {
+                    return LoadFromAssemblyPath(dllPath);
+                }
+                catch (Exception exception)
+                {
+                    Console.WriteLine(exception);
+                }
+
+                return null;
+            };
+            ResolvingUnmanagedDll += (assembly, unmanagedDllName) =>
+            {
+                var dllPath = resourcePath + Path.DirectorySeparatorChar + unmanagedDllName;
+                if (!File.Exists(dllPath)) return IntPtr.Zero;
+                try
+                {
+                    return LoadUnmanagedDllFromPath(dllPath);
+                }
+                catch (Exception exception)
+                {
+                    Console.WriteLine(exception);
+                }
+
+                return IntPtr.Zero;
+            };
         }
 
         protected override Assembly Load(AssemblyName assemblyName)
         {
             var assemblyPath = resolver.ResolveAssemblyToPath(assemblyName);
-            if (assemblyPath == null)
-            {
-                var dllPath = resourcePath + Path.DirectorySeparatorChar + assemblyName.Name;
-                if (File.Exists(dllPath))
-                {
-                    try
-                    {
-                        return LoadFromAssemblyPath(dllPath);
-                    }
-                    catch (Exception exception)
-                    {
-                        Console.WriteLine(exception);
-                    }
-                }
-            }
             return assemblyPath != null ? LoadFromAssemblyPath(assemblyPath) : null;
         }
 
         protected override IntPtr LoadUnmanagedDll(string 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;
         }
     }