pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

Don't crash if assembly resolution fails.
pull/876/merge
Daniel Grunwald 8 years ago committed by GitHub
parent
7bbbf39e3a 6a0edb1ef8
commit
9faeb9d680
2 changed files with 92 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 145
      ICSharpCode.Decompiler.Console/CustomAssemblyResolver.cs
  2. 34
      ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs

145
ICSharpCode.Decompiler.Console/CustomAssemblyResolver.cs
Unescape View File

@ -5,78 +5,83 @@ using Mono.Cecil;
namespace ICSharpCode.Decompiler.Console namespace ICSharpCode.Decompiler.Console
{ {
class CustomAssemblyResolver : DefaultAssemblyResolver class CustomAssemblyResolver : DefaultAssemblyResolver
{ {
DotNetCorePathFinder dotNetCorePathFinder; DotNetCorePathFinder dotNetCorePathFinder;
readonly string assemblyFileName; readonly string assemblyFileName;
readonly Dictionary<string, UnresolvedAssemblyNameReference> loadedAssemblyReferences; readonly Dictionary<string, UnresolvedAssemblyNameReference> loadedAssemblyReferences;
public string TargetFramework { get; set; } public string TargetFramework { get; set; }
public CustomAssemblyResolver(string fileName) public CustomAssemblyResolver(string fileName)
{ {
this.assemblyFileName = fileName; this.assemblyFileName = fileName;
this.loadedAssemblyReferences = new Dictionary<string, UnresolvedAssemblyNameReference>(); this.loadedAssemblyReferences = new Dictionary<string, UnresolvedAssemblyNameReference>();
AddSearchDirectory(Path.GetDirectoryName(fileName)); AddSearchDirectory(Path.GetDirectoryName(fileName));
RemoveSearchDirectory("."); RemoveSearchDirectory(".");
} }
public override AssemblyDefinition Resolve(AssemblyNameReference name) public override AssemblyDefinition Resolve(AssemblyNameReference name)
{ {
var targetFramework = TargetFramework.Split(new[] { ",Version=v" }, StringSplitOptions.None); var targetFramework = TargetFramework.Split(new[] { ",Version=v" }, StringSplitOptions.None);
string file = null; string file = null;
switch (targetFramework[0]) { switch (targetFramework[0]) {
case ".NETCoreApp": case ".NETCoreApp":
case ".NETStandard": case ".NETStandard":
if (targetFramework.Length != 2) goto default; if (targetFramework.Length != 2) goto default;
if (dotNetCorePathFinder == null) { if (dotNetCorePathFinder == null) {
var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1]; var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1];
dotNetCorePathFinder = new DotNetCorePathFinder(assemblyFileName, TargetFramework, version, this.loadedAssemblyReferences); dotNetCorePathFinder = new DotNetCorePathFinder(assemblyFileName, TargetFramework, version, this.loadedAssemblyReferences);
} }
file = dotNetCorePathFinder.TryResolveDotNetCore(name); file = dotNetCorePathFinder.TryResolveDotNetCore(name);
if (file == null) { if (file == null) {
string dir = Path.GetDirectoryName(assemblyFileName); string dir = Path.GetDirectoryName(assemblyFileName);
if (File.Exists(Path.Combine(dir, name.Name + ".dll"))) if (File.Exists(Path.Combine(dir, name.Name + ".dll")))
file = Path.Combine(dir, name.Name + ".dll"); file = Path.Combine(dir, name.Name + ".dll");
else if (File.Exists(Path.Combine(dir, name.Name + ".exe"))) else if (File.Exists(Path.Combine(dir, name.Name + ".exe")))
file = Path.Combine(dir, name.Name + ".exe"); file = Path.Combine(dir, name.Name + ".exe");
} }
if (file == null) if (file == null)
return base.Resolve(name); return base.Resolve(name);
else else
return ModuleDefinition.ReadModule(file, new ReaderParameters() { AssemblyResolver = this }).Assembly; return ModuleDefinition.ReadModule(file, new ReaderParameters() { AssemblyResolver = this }).Assembly;
default: default:
return base.Resolve(name); return base.Resolve(name);
} }
} }
public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters) public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
{ {
var targetFramework = TargetFramework.Split(new[] { ",Version=v" }, StringSplitOptions.None); try {
string file = null; var targetFramework = TargetFramework.Split(new[] { ",Version=v" }, StringSplitOptions.None);
switch (targetFramework[0]) { string file = null;
case ".NETCoreApp": switch (targetFramework[0]) {
case ".NETStandard": case ".NETCoreApp":
if (targetFramework.Length != 2) goto default; case ".NETStandard":
if (dotNetCorePathFinder == null) { if (targetFramework.Length != 2) goto default;
var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1]; if (dotNetCorePathFinder == null) {
dotNetCorePathFinder = new DotNetCorePathFinder(assemblyFileName, TargetFramework, version, this.loadedAssemblyReferences); var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1];
} dotNetCorePathFinder = new DotNetCorePathFinder(assemblyFileName, TargetFramework, version, this.loadedAssemblyReferences);
file = dotNetCorePathFinder.TryResolveDotNetCore(name); }
if (file == null) { file = dotNetCorePathFinder.TryResolveDotNetCore(name);
string dir = Path.GetDirectoryName(assemblyFileName); if (file == null) {
if (File.Exists(Path.Combine(dir, name.Name + ".dll"))) string dir = Path.GetDirectoryName(assemblyFileName);
file = Path.Combine(dir, name.Name + ".dll"); if (File.Exists(Path.Combine(dir, name.Name + ".dll")))
else if (File.Exists(Path.Combine(dir, name.Name + ".exe"))) file = Path.Combine(dir, name.Name + ".dll");
file = Path.Combine(dir, name.Name + ".exe"); else if (File.Exists(Path.Combine(dir, name.Name + ".exe")))
} file = Path.Combine(dir, name.Name + ".exe");
if (file == null) }
return base.Resolve(name, parameters); if (file == null)
else return base.Resolve(name, parameters);
return ModuleDefinition.ReadModule(file, parameters).Assembly; else
default: return ModuleDefinition.ReadModule(file, parameters).Assembly;
return base.Resolve(name, parameters); default:
} return base.Resolve(name, parameters);
} }
} } catch (AssemblyResolutionException exception) {
System.Console.WriteLine(exception.ToString());
return null;
}
}
}
} }

34
ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
Unescape View File

@ -41,7 +41,7 @@ namespace ICSharpCode.Decompiler.CSharp
{ {
#region Settings #region Settings
DecompilerSettings settings = new DecompilerSettings(); DecompilerSettings settings = new DecompilerSettings();
public DecompilerSettings Settings { public DecompilerSettings Settings {
get { get {
return settings; return settings;
@ -52,16 +52,16 @@ namespace ICSharpCode.Decompiler.CSharp
settings = value; settings = value;
} }
} }
/// <summary> /// <summary>
/// The MSBuild ProjectGuid to use for the new project. /// The MSBuild ProjectGuid to use for the new project.
/// <c>null</c> to automatically generate a new GUID. /// <c>null</c> to automatically generate a new GUID.
/// </summary> /// </summary>
public Guid? ProjectGuid { get; set; } public Guid? ProjectGuid { get; set; }
public int MaxDegreeOfParallelism { get; set; } = Environment.ProcessorCount; public int MaxDegreeOfParallelism { get; set; } = Environment.ProcessorCount;
#endregion #endregion
// per-run members // per-run members
HashSet<string> directories = new HashSet<string>(Platform.FileNameComparer); HashSet<string> directories = new HashSet<string>(Platform.FileNameComparer);
@ -73,7 +73,7 @@ namespace ICSharpCode.Decompiler.CSharp
/// can access it. /// can access it.
/// </remarks> /// </remarks>
protected string targetDirectory; protected string targetDirectory;
public void DecompileProject(ModuleDefinition moduleDefinition, string targetDirectory, CancellationToken cancellationToken = default(CancellationToken)) public void DecompileProject(ModuleDefinition moduleDefinition, string targetDirectory, CancellationToken cancellationToken = default(CancellationToken))
{ {
string projectFileName = Path.Combine(targetDirectory, CleanUpFileName(moduleDefinition.Assembly.Name.Name) + ".csproj"); string projectFileName = Path.Combine(targetDirectory, CleanUpFileName(moduleDefinition.Assembly.Name.Name) + ".csproj");
@ -81,7 +81,7 @@ namespace ICSharpCode.Decompiler.CSharp
DecompileProject(moduleDefinition, targetDirectory, writer, cancellationToken); DecompileProject(moduleDefinition, targetDirectory, writer, cancellationToken);
} }
} }
public void DecompileProject(ModuleDefinition moduleDefinition, string targetDirectory, TextWriter projectFileWriter, CancellationToken cancellationToken = default(CancellationToken)) public void DecompileProject(ModuleDefinition moduleDefinition, string targetDirectory, TextWriter projectFileWriter, CancellationToken cancellationToken = default(CancellationToken))
{ {
if (string.IsNullOrEmpty(targetDirectory)) { if (string.IsNullOrEmpty(targetDirectory)) {
@ -99,7 +99,7 @@ namespace ICSharpCode.Decompiler.CSharp
None, None,
Portable Portable
} }
#region WriteProjectFile #region WriteProjectFile
void WriteProjectFile(TextWriter writer, IEnumerable<Tuple<string, string>> files, ModuleDefinition module) void WriteProjectFile(TextWriter writer, IEnumerable<Tuple<string, string>> files, ModuleDefinition module)
{ {
@ -248,7 +248,7 @@ namespace ICSharpCode.Decompiler.CSharp
w.WriteEndDocument(); w.WriteEndDocument();
} }
} }
protected virtual bool IsGacAssembly(AssemblyNameReference r, AssemblyDefinition asm) protected virtual bool IsGacAssembly(AssemblyNameReference r, AssemblyDefinition asm)
{ {
return false; return false;
@ -272,7 +272,7 @@ namespace ICSharpCode.Decompiler.CSharp
decompiler.AstTransforms.Add(new RemoveCLSCompliantAttribute()); decompiler.AstTransforms.Add(new RemoveCLSCompliantAttribute());
return decompiler; return decompiler;
} }
IEnumerable<Tuple<string, string>> WriteAssemblyInfo(DecompilerTypeSystem ts, CancellationToken cancellationToken) IEnumerable<Tuple<string, string>> WriteAssemblyInfo(DecompilerTypeSystem ts, CancellationToken cancellationToken)
{ {
var decompiler = CreateDecompiler(ts); var decompiler = CreateDecompiler(ts);
@ -293,7 +293,7 @@ namespace ICSharpCode.Decompiler.CSharp
IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(ModuleDefinition module, CancellationToken cancellationToken) IEnumerable<Tuple<string, string>> WriteCodeFilesInProject(ModuleDefinition module, CancellationToken cancellationToken)
{ {
var files = module.Types.Where(IncludeTypeWhenDecompilingProject).GroupBy( var files = module.Types.Where(IncludeTypeWhenDecompilingProject).GroupBy(
delegate(TypeDefinition type) { delegate (TypeDefinition type) {
string file = CleanUpFileName(type.Name) + ".cs"; string file = CleanUpFileName(type.Name) + ".cs";
if (string.IsNullOrEmpty(type.Namespace)) { if (string.IsNullOrEmpty(type.Namespace)) {
return file; return file;
@ -301,7 +301,7 @@ namespace ICSharpCode.Decompiler.CSharp
string dir = CleanUpFileName(type.Namespace); string dir = CleanUpFileName(type.Namespace);
if (directories.Add(dir)) if (directories.Add(dir))
Directory.CreateDirectory(Path.Combine(targetDirectory, dir)); Directory.CreateDirectory(Path.Combine(targetDirectory, dir));
return Path.Combine(targetDirectory, dir, file); return Path.Combine(dir, file);
} }
}, StringComparer.OrdinalIgnoreCase).ToList(); }, StringComparer.OrdinalIgnoreCase).ToList();
DecompilerTypeSystem ts = new DecompilerTypeSystem(module); DecompilerTypeSystem ts = new DecompilerTypeSystem(module);
@ -311,7 +311,7 @@ namespace ICSharpCode.Decompiler.CSharp
MaxDegreeOfParallelism = this.MaxDegreeOfParallelism, MaxDegreeOfParallelism = this.MaxDegreeOfParallelism,
CancellationToken = cancellationToken CancellationToken = cancellationToken
}, },
delegate(IGrouping<string, TypeDefinition> file) { delegate (IGrouping<string, TypeDefinition> file) {
using (StreamWriter w = new StreamWriter(Path.Combine(targetDirectory, file.Key))) { using (StreamWriter w = new StreamWriter(Path.Combine(targetDirectory, file.Key))) {
CSharpDecompiler decompiler = CreateDecompiler(ts); CSharpDecompiler decompiler = CreateDecompiler(ts);
decompiler.CancellationToken = cancellationToken; decompiler.CancellationToken = cancellationToken;
@ -322,7 +322,7 @@ namespace ICSharpCode.Decompiler.CSharp
return files.Select(f => Tuple.Create("Compile", f.Key)).Concat(WriteAssemblyInfo(ts, cancellationToken)); return files.Select(f => Tuple.Create("Compile", f.Key)).Concat(WriteAssemblyInfo(ts, cancellationToken));
} }
#endregion #endregion
#region WriteResourceFilesInProject #region WriteResourceFilesInProject
protected virtual IEnumerable<Tuple<string, string>> WriteResourceFilesInProject(ModuleDefinition module) protected virtual IEnumerable<Tuple<string, string>> WriteResourceFilesInProject(ModuleDefinition module)
{ {
@ -358,7 +358,7 @@ namespace ICSharpCode.Decompiler.CSharp
} }
} }
} }
protected virtual IEnumerable<Tuple<string, string>> WriteResourceToFile(string fileName, string resourceName, Stream entryStream) protected virtual IEnumerable<Tuple<string, string>> WriteResourceToFile(string fileName, string resourceName, Stream entryStream)
{ {
using (FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write)) { using (FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write)) {
@ -366,7 +366,7 @@ namespace ICSharpCode.Decompiler.CSharp
} }
yield return Tuple.Create("EmbeddedResource", fileName); yield return Tuple.Create("EmbeddedResource", fileName);
} }
string GetFileNameForResource(string fullName) string GetFileNameForResource(string fullName)
{ {
string[] splitName = fullName.Split('.'); string[] splitName = fullName.Split('.');
@ -393,7 +393,7 @@ namespace ICSharpCode.Decompiler.CSharp
} }
} }
#endregion #endregion
/// <summary> /// <summary>
/// Cleans up a node name for use as a file name. /// Cleans up a node name for use as a file name.
/// </summary> /// </summary>
@ -410,7 +410,7 @@ namespace ICSharpCode.Decompiler.CSharp
text = text.Replace(c, '-'); text = text.Replace(c, '-');
return text; return text;
} }
public static string GetPlatformName(ModuleDefinition module) public static string GetPlatformName(ModuleDefinition module)
{ {
switch (module.Architecture) { switch (module.Architecture) {

Write Preview
Loading…
Cancel
Save