PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Don't unregister plugin assembly resolver.

Browse Source
This commit is contained in:
Westin Miller
2018-08-13 19:33:38 -07:00
committed by GitHub
parent 65e8d62391
commit f8e9d68ceb
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Torch/Plugins/PluginManager.cs
View File

@@ -325,21 +325,19 @@ namespace Torch.Managers
if (IsAssemblyCompatible(requiredAssemblyName, asm.GetName())) if (IsAssemblyCompatible(requiredAssemblyName, asm.GetName()))
return asm; return asm;
} }
_log.Warn($"Could find dependent assembly! Requesting assembly: {args.RequestingAssembly}, dependent assembly: {requiredAssemblyName}"); foreach (var asm in assemblies)
if (asm == args.RequestingAssembly)
{
_log.Warn($"Could find dependent assembly! Requesting assembly: {args.RequestingAssembly}, dependent assembly: {requiredAssemblyName}");
break;
}
return null; return null;
} }
try AppDomain.CurrentDomain.AssemblyResolve += ResolveDependentAssembly;
foreach (Assembly asm in assemblies)
{ {
AppDomain.CurrentDomain.AssemblyResolve += ResolveDependentAssembly; TorchBase.RegisterAuxAssembly(asm);
foreach (Assembly asm in assemblies)
{
TorchBase.RegisterAuxAssembly(asm);
}
}
finally
{
AppDomain.CurrentDomain.AssemblyResolve -= ResolveDependentAssembly;
} }
} }