Exclude Microsoft.Extensions.DependencyModel only (#3903)

Particular · Dec 19, 2023 · 961790f · 961790f
1 parent add2b8b
commit 961790f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ServiceControl.Management.PowerShell/InstallerEngineAssemblyLoadContext.cs b/src/ServiceControl.Management.PowerShell/InstallerEngineAssemblyLoadContext.cs
@@ -14,7 +14,7 @@ public InstallerEngineAssemblyLoadContext()
         var executingAssemblyDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
         var assemblyPath = Path.Combine(executingAssemblyDirectory, "InstallerEngine", "ServiceControlInstaller.Engine.dll");
 
-        resolver = new DependencyResolver(assemblyPath);
+        resolver = new(assemblyPath);
     }
 
     protected override Assembly Load(AssemblyName assemblyName)

diff --git a/src/ServiceControl.Management.PowerShell/ModuleAssemblyInitializer.cs b/src/ServiceControl.Management.PowerShell/ModuleAssemblyInitializer.cs
@@ -14,13 +14,14 @@ public class ModuleAssemblyInitializer : IModuleAssemblyInitializer, IModuleAsse
 
         static Assembly Resolve(AssemblyLoadContext defaultLoadContext, AssemblyName assemblyName)
         {
-            if (assemblyName.Name.Contains("ServiceControlInstaller.Engine"))
+            // Don't try to use InstallerEngineAssemblyLoadContext to resolve the assembly it has a dependency on
+            if (assemblyName.Name.Contains("Microsoft.Extensions.DependencyModel"))
             {
-                return installerEngineLoadContext.LoadFromAssemblyName(assemblyName);
+                return null;
             }
             else
             {
-                return null;
+                return installerEngineLoadContext.LoadFromAssemblyName(assemblyName);
             }
         }
     }