Update asm resolver

dnSpy · Feb 12, 2019 · f3ecae8 · f3ecae8
1 parent 200c253
commit f3ecae8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/dnSpy/dnSpy/Documents/AssemblyResolver.cs b/dnSpy/dnSpy/Documents/AssemblyResolver.cs
@@ -463,6 +463,7 @@ IDsDocument ResolveNormal(IAssembly assembly, ModuleDef sourceModule) {
 			if (fwkKind == FrameworkKind.DotNetCore && !dotNetCorePathProvider.HasDotNetCore)
 				fwkKind = FrameworkKind.DotNetFramework4;
 			IDsDocument document;
+			IDsDocument existingDocument;
 			switch (fwkKind) {
 			case FrameworkKind.Unknown:
 			case FrameworkKind.DotNetFramework2:
@@ -489,7 +490,7 @@ IDsDocument ResolveNormal(IAssembly assembly, ModuleDef sourceModule) {
 					gacVersion = -1;
 				}
 
-				var existingDocument = documentService.FindAssembly(assembly);
+				existingDocument = documentService.FindAssembly(assembly);
 				if (existingDocument != null)
 					return existingDocument;
 
@@ -527,6 +528,12 @@ IDsDocument ResolveNormal(IAssembly assembly, ModuleDef sourceModule) {
 				document = LookupFromSearchPaths(assembly, sourceModule, sourceModuleDirectoryHint, netCoreVersion);
 				if (document != null)
 					return documentService.GetOrAddCanDispose(document, assembly);
+
+				// If it already exists in assembly explorer, use it
+				existingDocument = documentService.FindAssembly(assembly);
+				if (existingDocument != null)
+					return existingDocument;
+
 				break;
 
 			default: