diff --git a/cecil b/cecil index 71903d8b..927dcbb8 160000 --- a/cecil +++ b/cecil @@ -1 +1 @@ -Subproject commit 71903d8b3a3796fd759cc5b4e7b16da22a000d87 +Subproject commit 927dcbb86fd089a9ba4dbe689ac40b9c6f3ab758 diff --git a/de4dot.code/AssemblyResolver.cs b/de4dot.code/AssemblyResolver.cs index e36df1ef..1245ce06 100644 --- a/de4dot.code/AssemblyResolver.cs +++ b/de4dot.code/AssemblyResolver.cs @@ -31,8 +31,6 @@ namespace de4dot.code { Dictionary addedDirectories = new Dictionary(StringComparer.OrdinalIgnoreCase); static AssemblyResolver() { - // Make sure there's only ONE assembly resolver - GlobalAssemblyResolver.Instance = Instance; addOtherAssemblySearchPaths(); } diff --git a/de4dot.code/ExternalAssemblies.cs b/de4dot.code/ExternalAssemblies.cs index b3018c48..54daffb1 100644 --- a/de4dot.code/ExternalAssemblies.cs +++ b/de4dot.code/ExternalAssemblies.cs @@ -60,7 +60,7 @@ namespace de4dot.code { AssemblyDefinition asmDef = null; try { - asmDef = GlobalAssemblyResolver.Instance.Resolve(asmFullName); + asmDef = AssemblyResolver.Instance.Resolve(asmFullName); } catch (ResolutionException) { }