Skip to content

Commit 961790f

Browse files
authored
Exclude Microsoft.Extensions.DependencyModel only (#3903)
1 parent add2b8b commit 961790f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/ServiceControl.Management.PowerShell/InstallerEngineAssemblyLoadContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public InstallerEngineAssemblyLoadContext()
1414
var executingAssemblyDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
1515
var assemblyPath = Path.Combine(executingAssemblyDirectory, "InstallerEngine", "ServiceControlInstaller.Engine.dll");
1616

17-
resolver = new DependencyResolver(assemblyPath);
17+
resolver = new(assemblyPath);
1818
}
1919

2020
protected override Assembly Load(AssemblyName assemblyName)

src/ServiceControl.Management.PowerShell/ModuleAssemblyInitializer.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ public class ModuleAssemblyInitializer : IModuleAssemblyInitializer, IModuleAsse
1414

1515
static Assembly Resolve(AssemblyLoadContext defaultLoadContext, AssemblyName assemblyName)
1616
{
17-
if (assemblyName.Name.Contains("ServiceControlInstaller.Engine"))
17+
// Don't try to use InstallerEngineAssemblyLoadContext to resolve the assembly it has a dependency on
18+
if (assemblyName.Name.Contains("Microsoft.Extensions.DependencyModel"))
1819
{
19-
return installerEngineLoadContext.LoadFromAssemblyName(assemblyName);
20+
return null;
2021
}
2122
else
2223
{
23-
return null;
24+
return installerEngineLoadContext.LoadFromAssemblyName(assemblyName);
2425
}
2526
}
2627
}

0 commit comments

Comments
 (0)