Merge pull request #875 from mohe2015/fix-assembly-resolution

Don't crash if assembly resolution fails.

ICSharpCode.Decompiler.Console/CustomAssemblyResolver.cs

@@ -52,6 +52,7 @@ namespace ICSharpCode.Decompiler.Console
 
 		public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
 		{
+			try {
 				var targetFramework = TargetFramework.Split(new[] { ",Version=v" }, StringSplitOptions.None);
 				string file = null;
 				switch (targetFramework[0]) {
@@ -77,6 +78,10 @@ namespace ICSharpCode.Decompiler.Console
 					default:
 						return base.Resolve(name, parameters);
 				}
+			} catch (AssemblyResolutionException exception) {
+				System.Console.WriteLine(exception.ToString());
+				return null;
+			}
 		}
 	}
 }

ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs

@@ -293,7 +293,7 @@ namespace ICSharpCode.Decompiler.CSharp
 		IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(ModuleDefinition module, CancellationToken cancellationToken)
 		{
 			var files = module.Types.Where(IncludeTypeWhenDecompilingProject).GroupBy(
-				delegate(TypeDefinition type) {
+				delegate (TypeDefinition type) {
 					string file = CleanUpFileName(type.Name) + ".cs";
 					if (string.IsNullOrEmpty(type.Namespace)) {
 						return file;
@@ -301,7 +301,7 @@ namespace ICSharpCode.Decompiler.CSharp
 						string dir = CleanUpFileName(type.Namespace);
 						if (directories.Add(dir))
 							Directory.CreateDirectory(Path.Combine(targetDirectory, dir));
-						return Path.Combine(targetDirectory, dir, file);
+						return Path.Combine(dir, file);
 					}
 				}, StringComparer.OrdinalIgnoreCase).ToList();
 			DecompilerTypeSystem ts = new DecompilerTypeSystem(module);
@@ -311,7 +311,7 @@ namespace ICSharpCode.Decompiler.CSharp
 					MaxDegreeOfParallelism = this.MaxDegreeOfParallelism,
 					CancellationToken = cancellationToken
 				},
-				delegate(IGrouping<string, TypeDefinition> file) {
+				delegate (IGrouping<string, TypeDefinition> file) {
 					using (StreamWriter w = new StreamWriter(Path.Combine(targetDirectory, file.Key))) {
 						CSharpDecompiler decompiler = CreateDecompiler(ts);
 						decompiler.CancellationToken = cancellationToken;