Don't unregister plugin assembly resolver.

This commit is contained in:
Westin Miller
2018-08-13 19:33:38 -07:00
committed by GitHub
parent 65e8d62391
commit f8e9d68ceb

View File

@@ -325,23 +325,21 @@ namespace Torch.Managers
if (IsAssemblyCompatible(requiredAssemblyName, asm.GetName()))
return asm;
}
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;
}
try
{
AppDomain.CurrentDomain.AssemblyResolve += ResolveDependentAssembly;
foreach (Assembly asm in assemblies)
{
TorchBase.RegisterAuxAssembly(asm);
}
}
finally
{
AppDomain.CurrentDomain.AssemblyResolve -= ResolveDependentAssembly;
}
}
private static bool IsAssemblyCompatible(AssemblyName a, AssemblyName b)
{