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

Move to new API

pull/960/head
Christoph Wille 8 years ago
parent
15077d65b9
commit
ec677b0785
3 changed files with 141 additions and 248 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. 87
      ICSharpCode.Decompiler.Console/CustomAssemblyResolver.cs
  2. 255
      ICSharpCode.Decompiler.Console/Program.cs
  3. 47
      ICSharpCode.Decompiler.Console/TypesParser.cs

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

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

255
ICSharpCode.Decompiler.Console/Program.cs
Unescape View File

@ -2,172 +2,105 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using McMaster.Extensions.CommandLineUtils;
using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.CSharp;
using ICSharpCode.Decompiler.CSharp.OutputVisitor;
using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.CSharp.Transforms;
using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using McMaster.Extensions.CommandLineUtils;
using Mono.Cecil; using Mono.Cecil;
namespace ICSharpCode.Decompiler.Console namespace ICSharpCode.Decompiler.Console
{ {
class Program class Program
{ {
static int Main(string[] args) static int Main(string[] args)
{ {
// https://github.com/natemcmaster/CommandLineUtils/ // https://github.com/natemcmaster/CommandLineUtils/
// Older cmd line clients (for options reference): https://github.com/aerror2/ILSpy-For-MacOSX and https://github.com/andreif/ILSpyMono // Older cmd line clients (for options reference): https://github.com/aerror2/ILSpy-For-MacOSX and https://github.com/andreif/ILSpyMono
var app = new CommandLineApplication(); var app = new CommandLineApplication();
app.HelpOption("-h|--help"); app.HelpOption("-h|--help");
var inputAssemblyFileName = app.Argument("Assembly filename name", "The assembly that is being decompiled. This argument is mandatory."); var inputAssemblyFileName = app.Argument("Assembly filename name", "The assembly that is being decompiled. This argument is mandatory.");
var projectOption = app.Option("-p|--project", "Decompile assembly as compilable project. This requires the output directory option.", CommandOptionType.NoValue); var projectOption = app.Option("-p|--project", "Decompile assembly as compilable project. This requires the output directory option.", CommandOptionType.NoValue);
var outputOption = app.Option("-o|--outputdir <directory>", "The output directory, if omitted decompiler output is written to standard out.", CommandOptionType.SingleValue); var outputOption = app.Option("-o|--outputdir <directory>", "The output directory, if omitted decompiler output is written to standard out.", CommandOptionType.SingleValue);
var typeOption = app.Option("-t|--type <type-name>", "The FQN of the type to decompile.", CommandOptionType.SingleValue); var typeOption = app.Option("-t|--type <type-name>", "The FQN of the type to decompile.", CommandOptionType.SingleValue);
var listOption = app.Option("-l|--list <entity-type(s)>", "Lists all entities of the specified type(s). Valid types: c(lass), i(interface), s(truct), d(elegate), e(num)", CommandOptionType.MultipleValue); var listOption = app.Option("-l|--list <entity-type(s)>", "Lists all entities of the specified type(s). Valid types: c(lass), i(interface), s(truct), d(elegate), e(num)", CommandOptionType.MultipleValue);
app.ExtendedHelpText = Environment.NewLine + "-o is valid with every option and required when using -p."; app.ExtendedHelpText = Environment.NewLine + "-o is valid with every option and required when using -p.";
app.ThrowOnUnexpectedArgument = false; // Ignore invalid arguments / options app.ThrowOnUnexpectedArgument = false; // Ignore invalid arguments / options
app.OnExecute(() => { app.OnExecute(() => {
// HACK : the CommandLineUtils package does not allow us to specify an argument as mandatory. // HACK : the CommandLineUtils package does not allow us to specify an argument as mandatory.
// Therefore we're implementing it as simple as possible. // Therefore we're implementing it as simple as possible.
if (inputAssemblyFileName.Value == null) { if (inputAssemblyFileName.Value == null) {
app.ShowHint(); app.ShowHint();
return -1; return -1;
} }
if (!File.Exists(inputAssemblyFileName.Value)) { if (!File.Exists(inputAssemblyFileName.Value)) {
app.Error.WriteLine($"ERROR: Input file not found."); app.Error.WriteLine($"ERROR: Input file not found.");
return -1; return -1;
} }
if (!outputOption.HasValue() && projectOption.HasValue()) { if (!outputOption.HasValue() && projectOption.HasValue()) {
app.Error.WriteLine($"ERROR: Output directory not speciified."); app.Error.WriteLine($"ERROR: Output directory not speciified.");
return -1; return -1;
} }
if (outputOption.HasValue() && !Directory.Exists(outputOption.Value())) { if (outputOption.HasValue() && !Directory.Exists(outputOption.Value())) {
app.Error.WriteLine($"ERROR: Output directory '{outputOption.Value()}' does not exist."); app.Error.WriteLine($"ERROR: Output directory '{outputOption.Value()}' does not exist.");
return -1; return -1;
} }
if (projectOption.HasValue()) { if (projectOption.HasValue()) {
DecompileAsProject(inputAssemblyFileName.Value, outputOption.Value()); DecompileAsProject(inputAssemblyFileName.Value, outputOption.Value());
} else if (listOption.HasValue()) { } else if (listOption.HasValue()) {
var values = listOption.Values.SelectMany(v => v.Split(',', ';')).ToArray(); var values = listOption.Values.SelectMany(v => v.Split(',', ';')).ToArray();
HashSet<TypeKind> kinds = ParseSelection(values); HashSet<TypeKind> kinds = TypesParser.ParseSelection(values);
TextWriter output = System.Console.Out; TextWriter output = System.Console.Out;
if (outputOption.HasValue()) { if (outputOption.HasValue()) {
string directory = outputOption.Value(); string directory = outputOption.Value();
string outputName = Path.GetFileNameWithoutExtension(inputAssemblyFileName.Value); string outputName = Path.GetFileNameWithoutExtension(inputAssemblyFileName.Value);
output = File.CreateText(Path.Combine(directory, outputName) + ".list.txt"); output = File.CreateText(Path.Combine(directory, outputName) + ".list.txt");
} }
ListContent(inputAssemblyFileName.Value, output, kinds); ListContent(inputAssemblyFileName.Value, output, kinds);
} else { } else {
TextWriter output = System.Console.Out; TextWriter output = System.Console.Out;
if (outputOption.HasValue()) { if (outputOption.HasValue()) {
string directory = outputOption.Value(); string directory = outputOption.Value();
string outputName = Path.GetFileNameWithoutExtension(inputAssemblyFileName.Value); string outputName = Path.GetFileNameWithoutExtension(inputAssemblyFileName.Value);
output = File.CreateText(Path.Combine(directory, (typeOption.Value() ?? outputName) + ".decompiled.cs")); output = File.CreateText(Path.Combine(directory, (typeOption.Value() ?? outputName) + ".decompiled.cs"));
} }
Decompile(inputAssemblyFileName.Value, output); Decompile(inputAssemblyFileName.Value, output);
} }
return 0; return 0;
}); });
return app.Execute(args); return app.Execute(args);
} }
static void ListContent(string assemblyFileName, TextWriter output, ISet<TypeKind> kinds) static void ListContent(string assemblyFileName, TextWriter output, ISet<TypeKind> kinds)
{ {
DefaultAssemblyResolver resolver = new DefaultAssemblyResolver(); CSharpDecompiler decompiler = new CSharpDecompiler(assemblyFileName, new DecompilerSettings());
resolver.AddSearchDirectory(Path.GetDirectoryName(assemblyFileName));
resolver.RemoveSearchDirectory("."); foreach (var type in decompiler.TypeSystem.Compilation.MainAssembly.GetAllTypeDefinitions()) {
if (!kinds.Contains(type.Kind))
var module = ModuleDefinition.ReadModule(assemblyFileName, new ReaderParameters { continue;
AssemblyResolver = resolver, output.WriteLine($"{type.Kind} {type.FullName}");
InMemory = true }
}); }
var typeSystem = new DecompilerTypeSystem(module); static void DecompileAsProject(string assemblyFileName, string outputDirectory)
{
foreach (var type in typeSystem.MainAssembly.GetAllTypeDefinitions()) { ModuleDefinition module = UniversalAssemblyResolver.LoadMainModule(assemblyFileName);
if (!kinds.Contains(type.Kind)) WholeProjectDecompiler decompiler = new WholeProjectDecompiler();
continue; decompiler.DecompileProject(module, outputDirectory);
output.WriteLine($"{type.Kind} {type.FullName}"); }
}
} static void Decompile(string assemblyFileName, TextWriter output, string typeName = null)
{
static void DecompileAsProject(string assemblyFileName, string outputDirectory) CSharpDecompiler decompiler = new CSharpDecompiler(assemblyFileName, new DecompilerSettings());
{
ModuleDefinition module = LoadModule(assemblyFileName); if (typeName == null) {
WholeProjectDecompiler decompiler = new WholeProjectDecompiler(); output.Write(decompiler.DecompileWholeModuleAsString());
decompiler.DecompileProject(module, outputDirectory); } else {
} var name = new FullTypeName(typeName);
output.Write(decompiler.DecompileTypeAsString(name));
static void Decompile(string assemblyFileName, TextWriter output, string typeName = null) }
{ }
ModuleDefinition module = LoadModule(assemblyFileName); }
var typeSystem = new DecompilerTypeSystem(module);
CSharpDecompiler decompiler = new CSharpDecompiler(typeSystem, new DecompilerSettings());
decompiler.AstTransforms.Add(new EscapeInvalidIdentifiers());
SyntaxTree syntaxTree;
if (typeName == null)
syntaxTree = decompiler.DecompileWholeModuleAsSingleFile();
else
syntaxTree = decompiler.DecompileTypes(module.GetTypes().Where(td => string.Equals(td.FullName, typeName, StringComparison.OrdinalIgnoreCase)));
var visitor = new CSharpOutputVisitor(output, FormattingOptionsFactory.CreateSharpDevelop());
syntaxTree.AcceptVisitor(visitor);
}
static HashSet<TypeKind> ParseSelection(string[] values)
{
var possibleValues = new Dictionary<string, TypeKind>(StringComparer.OrdinalIgnoreCase) { ["class"] = TypeKind.Class, ["struct"] = TypeKind.Struct, ["interface"] = TypeKind.Interface, ["enum"] = TypeKind.Enum, ["delegate"] = TypeKind.Delegate };
HashSet<TypeKind> kinds = new HashSet<TypeKind>();
if (values.Length == 1 && !possibleValues.Keys.Any(v => values[0].StartsWith(v, StringComparison.OrdinalIgnoreCase))) {
foreach (char ch in values[0]) {
switch (ch) {
case 'c':
kinds.Add(TypeKind.Class);
break;
case 'i':
kinds.Add(TypeKind.Interface);
break;
case 's':
kinds.Add(TypeKind.Struct);
break;
case 'd':
kinds.Add(TypeKind.Delegate);
break;
case 'e':
kinds.Add(TypeKind.Enum);
break;
}
}
} else {
foreach (var value in values) {
string v = value;
while (v.Length > 0 && !possibleValues.ContainsKey(v))
v = v.Remove(v.Length - 1);
if (possibleValues.TryGetValue(v, out var kind))
kinds.Add(kind);
}
}
return kinds;
}
static ModuleDefinition LoadModule(string assemblyFileName)
{
var resolver = new CustomAssemblyResolver(assemblyFileName);
var module = ModuleDefinition.ReadModule(assemblyFileName, new ReaderParameters {
AssemblyResolver = resolver,
InMemory = true
});
resolver.TargetFramework = module.Assembly.DetectTargetFrameworkId();
return module;
}
}
} }

47
ICSharpCode.Decompiler.Console/TypesParser.cs
Unescape View File

@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.Decompiler.Console
{
public static class TypesParser
{
public static HashSet<TypeKind> ParseSelection(string[] values)
{
var possibleValues = new Dictionary<string, TypeKind>(StringComparer.OrdinalIgnoreCase) { ["class"] = TypeKind.Class, ["struct"] = TypeKind.Struct, ["interface"] = TypeKind.Interface, ["enum"] = TypeKind.Enum, ["delegate"] = TypeKind.Delegate };
HashSet<TypeKind> kinds = new HashSet<TypeKind>();
if (values.Length == 1 && !possibleValues.Keys.Any(v => values[0].StartsWith(v, StringComparison.OrdinalIgnoreCase))) {
foreach (char ch in values[0]) {
switch (ch) {
case 'c':
kinds.Add(TypeKind.Class);
break;
case 'i':
kinds.Add(TypeKind.Interface);
break;
case 's':
kinds.Add(TypeKind.Struct);
break;
case 'd':
kinds.Add(TypeKind.Delegate);
break;
case 'e':
kinds.Add(TypeKind.Enum);
break;
}
}
} else {
foreach (var value in values) {
string v = value;
while (v.Length > 0 && !possibleValues.ContainsKey(v))
v = v.Remove(v.Length - 1);
if (possibleValues.TryGetValue(v, out var kind))
kinds.Add(kind);
}
}
return kinds;
}
}
}
Write Preview
Loading…
Cancel
Save