Properly resolve local assemblies.

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj

@@ -64,7 +64,6 @@
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="DebuggerDecompilerService.cs" />
-    <Compile Include="LaunchILSpy\Fusion.cs" />
     <Compile Include="LaunchILSpy\ILSpyAssemblyResolver.cs" />
     <Compile Include="NavigateToDecompiledEntityService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/AddIns/DisplayBindings/ILSpyAddIn/LaunchILSpy/ILSpyAssemblyResolver.cs

@@ -8,6 +8,7 @@
 using System.Text;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Dom;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpyAddIn.LaunchILSpy
@@ -16,6 +17,7 @@ class ILSpyAssemblyResolver : IAssemblyResolver
 	{
 		readonly DirectoryInfo directoryInfo;
 		readonly IDictionary<string, AssemblyDefinition> cache;
+		readonly IDictionary<string, AssemblyDefinition> localAssembliesCache;
 
 		public ILSpyAssemblyResolver(string decompiledAssemblyFolder)
 		{
@@ -25,6 +27,9 @@ public ILSpyAssemblyResolver(string decompiledAssemblyFolder)
 			FolderPath = decompiledAssemblyFolder;
 			this.directoryInfo = new DirectoryInfo(decompiledAssemblyFolder);
 			this.cache = new Dictionary<string, AssemblyDefinition> ();
+			this.localAssembliesCache = new Dictionary<string, AssemblyDefinition>();
+
+			ReadLocalAssemblies();
 		}
 
 		public string FolderPath {
@@ -49,13 +54,9 @@ public AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters p
 				if (cache.TryGetValue(name.FullName, out assembly))
 					return assembly;
 
-				// serach into assemblyDecompiledFolder
-				var file = this.directoryInfo.GetFiles()
-					.Where(f => f != null && f.FullName.Contains(name.Name))
-					.FirstOrDefault();
-
-				if (file != null) {
-					assembly = AssemblyDefinition.ReadAssembly(file.FullName, parameters);
+				// search into assemblyDecompiledFolder
+				if (localAssembliesCache.ContainsKey(name.FullName)) {
+					assembly = localAssembliesCache[name.FullName];
 				}
 
 				if (assembly == null) {
@@ -72,7 +73,7 @@ public AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters p
 				}
 				return assembly;
 			} catch (Exception ex) {
-				LoggingService.Error("Exception: " + ex.Message);
+				LoggingService.Error("Exception (ILSpyAssemblyResolver): " + ex.Message);
 				return null;
 			}
 		}
@@ -90,6 +91,19 @@ public AssemblyDefinition Resolve(string fullName, ReaderParameters parameters)
 			return Resolve(AssemblyNameReference.Parse(fullName), parameters);
 		}
 
+		void ReadLocalAssemblies()
+		{
+			// read local assemblies
+			foreach (var file in this.directoryInfo.GetFiles()) {
+				try {
+					var localAssembly = AssemblyDefinition.ReadAssembly(file.FullName);
+					localAssembliesCache.Add(localAssembly.FullName, localAssembly);
+				} catch {
+					// unable to read assembly file
+				}
+			}
+		}
+
 		#region FindAssemblyInGac
 		// This region is based on code from Mono.Cecil:
 
@@ -118,7 +132,7 @@ public AssemblyDefinition Resolve(string fullName, ReaderParameters parameters)
 		// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		//
 
-		static readonly string[] gac_paths = { Fusion.GetGacPath(false), Fusion.GetGacPath(true) };
+		static readonly string[] gac_paths = { GacInterop.GacRootPathV2, GacInterop.GacRootPathV4 };
 		static readonly string[] gacs = { "GAC_MSIL", "GAC_32", "GAC" };
 		static readonly string[] prefixes = { string.Empty, "v4.0_" };
 

src/AddIns/DisplayBindings/ILSpyAddIn/ViewContent/DecompiledViewContent.cs

@@ -146,7 +146,7 @@ void DecompilationThread()
 				AnalyticsMonitorService.TrackException(ex);
 
 				StringWriter writer = new StringWriter();
-				writer.WriteLine("Exception while decompiling " + fullTypeName);
+				writer.WriteLine(string.Format("Exception while decompiling {0} ({1})", fullTypeName, assemblyFile));
 				writer.WriteLine();
 				writer.WriteLine(ex.ToString());
 				WorkbenchSingleton.SafeThreadAsyncCall(OnDecompilationFinished, writer);