fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-03 15:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DnsApplicationAssemblyLoadContext: fixed issue caused when an assembly is already loaded in default context but is required for loading assembly in current context. Minor code refactoring done.

Browse Source
This commit is contained in:
Shreyas Zare
2024-11-23 17:52:16 +05:30
parent 3d6809ba1b
commit a63a12ea4a
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
DnsServerCore/Dns/Applications/DnsApplicationAssemblyLoadContext.cs
View File

@@ -63,6 +63,27 @@ namespace DnsServerCore.Dns.Applications
}
};
Resolving += delegate (AssemblyLoadContext currentContext, AssemblyName requiredAssembly)
{
string requiredAssemblyName = requiredAssembly.Name;
foreach (Assembly loadedAssembly in Default.Assemblies)
{
if (!string.IsNullOrEmpty(loadedAssembly.Location))
{
if (requiredAssemblyName.Equals(Path.GetFileNameWithoutExtension(loadedAssembly.Location), StringComparison.OrdinalIgnoreCase))
return loadedAssembly;
}
else
{
if (requiredAssemblyName.Equals(loadedAssembly.GetName().Name, StringComparison.OrdinalIgnoreCase))
return loadedAssembly;
}
}
return null;
};
//load all app assemblies
IEnumerable<Assembly> loadedAssemblies = Default.Assemblies;
Dictionary<string, Assembly> appAssemblies = new Dictionary<string, Assembly>();
@@ -77,7 +98,7 @@ namespace DnsServerCore.Dns.Applications
{
if (!string.IsNullOrEmpty(loadedAssembly.Location))
{
if (Path.GetFileNameWithoutExtension(loadedAssembly.Location).Equals(dllFileName, StringComparison.OrdinalIgnoreCase))
if (dllFileName.Equals(Path.GetFileNameWithoutExtension(loadedAssembly.Location), StringComparison.OrdinalIgnoreCase))
{
isLoaded = true;
break;
@@ -85,9 +106,7 @@ namespace DnsServerCore.Dns.Applications
}
else
{
AssemblyName assemblyName = loadedAssembly.GetName();
if ((assemblyName.Name != null) && assemblyName.Name.Equals(dllFileName, StringComparison.OrdinalIgnoreCase))
if (dllFileName.Equals(loadedAssembly.GetName().Name, StringComparison.OrdinalIgnoreCase))
{
isLoaded = true;
break;