Fix loading plugin assemblies from deps.json on linux (case sensitive)

reqnroll · Jan 26, 2025 · 9af9d46 · 9af9d46
1 parent d195a79
commit 9af9d46
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 18 deletions.
diff --git a/Reqnroll/Plugins/DotNetFrameworkPluginAssemblyResolver.cs b/Reqnroll/Plugins/DotNetFrameworkPluginAssemblyResolver.cs
@@ -62,7 +62,9 @@ Assembly TryAssemblyResolve(object sender, ResolveEventArgs args)
                     library.Hash,
                     library.RuntimeAssemblyGroups.SelectMany(g => g.AssetPaths),
                     library.Dependencies,
-                    library.Serviceable);
+                    library.Serviceable,
+                    library.Path,
+                    library.HashPath);
 
                 var assemblies = new List<string>();
                 if (assemblyResolver.TryResolveAssemblyPaths(wrapper, assemblies))

diff --git a/Reqnroll/Plugins/PluginAssemblyResolver.cs b/Reqnroll/Plugins/PluginAssemblyResolver.cs
@@ -24,17 +24,28 @@ public PluginAssemblyResolver(string path)
         {
             _loadContext = AssemblyLoadContext.GetLoadContext(typeof(PluginAssemblyResolver).Assembly);
             Assembly = _loadContext.LoadFromAssemblyPath(path);
-            _dependencyContext = DependencyContext.Load(Assembly);
 
-            _assemblyResolver = new CompositeCompilationAssemblyResolver(
-            [
-                new AppBaseCompilationAssemblyResolver(Path.GetDirectoryName(path)!),
-                new ReferenceAssemblyPathResolver(),
-                new PackageCompilationAssemblyResolver()
-            ]);
+            try
+            {
+                _dependencyContext = DependencyContext.Load(Assembly);
+
+                if (_dependencyContext is null)
+                    return;
 
-            _loadContext.Resolving += OnResolving;
-            _loadContext.Unloading += OnUnloading;
+                _assemblyResolver = new CompositeCompilationAssemblyResolver(
+                [
+                    new AppBaseCompilationAssemblyResolver(Path.GetDirectoryName(path)!),
+                    new ReferenceAssemblyPathResolver(),
+                    new PackageCompilationAssemblyResolver()
+                ]);
+
+                _loadContext.Resolving += OnResolving;
+                _loadContext.Unloading += OnUnloading;
+            }
+            catch (Exception)
+            {
+                // Don't throw if we can't load the dependencies from .deps.json
+            }
         }
 
         private void OnUnloading(AssemblyLoadContext context)
@@ -45,30 +56,52 @@ private void OnUnloading(AssemblyLoadContext context)
 
         private Assembly OnResolving(AssemblyLoadContext context, AssemblyName name)
         {
-            var library = _dependencyContext?.RuntimeLibraries.FirstOrDefault(
+            try
+            {
+                var library = _dependencyContext?.RuntimeLibraries.FirstOrDefault(
                 runtimeLibrary => string.Equals(runtimeLibrary.Name, name.Name, StringComparison.OrdinalIgnoreCase));
 
-            if (library != null)
-            {
+                if (library == null)
+                    return null;
+
                 var wrapper = new CompilationLibrary(
                     library.Type,
                     library.Name,
                     library.Version,
                     library.Hash,
                     library.RuntimeAssemblyGroups.SelectMany(g => g.AssetPaths),
                     library.Dependencies,
-                    library.Serviceable);
+                    library.Serviceable,
+                    library.Path,
+                    library.HashPath);
 
                 var assemblies = new List<string>();
                 _assemblyResolver.TryResolveAssemblyPaths(wrapper, assemblies);
 
-                if (assemblies.Count > 0)
+                if (_assemblyResolver.TryResolveAssemblyPaths(wrapper, assemblies))
                 {
-                    return _loadContext.LoadFromAssemblyPath(assemblies[0]);
+                    foreach (var asm in assemblies)
+                    {
+                        try
+                        {
+                            var assembly = _loadContext.LoadFromAssemblyPath(asm);
+                            return assembly;
+                        }
+                        catch
+                        {
+                            // Don't throw if we can't load the specified assembly (perhaps something is missing or misconfigured)
+                            continue;
+                        }
+                    }
                 }
-            }
 
-            return null;
+                return null;
+            }
+            catch
+            {
+                // Don't throw if we can't load the dependencies from .deps.json
+                return null;
+            }
         }
 
         public static Assembly Load(string path)