Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -93,7 +93,7 @@ namespace Ildasm
void AppendTypeName(StringBuilder sb, Type type, string typeName, bool noself = false, bool securityCompatHack = false)
{
if (type.Assembly == assembly && !noself && (!type.IsGenericType || type.IsGenericTypeDefinition) && !type.HasElementType)
if (type.Assembly == assembly && !type.__IsMissing && !noself && (!type.IsGenericType || type.IsGenericTypeDefinition) && !type.HasElementType)
{
AppendTypeName(sb, type);
}

View File

@@ -1 +1 @@
063e29423b1ef64006f7641d4c4cf10f84209899
b7e5c1ad91e7e650b27e4bd270102e6dd61dc752

View File

@@ -176,6 +176,7 @@ namespace Ildasm
"opt",
"or",
"out",
"permitonly",
"pinned",
"pop",
"prefix1",
@@ -191,6 +192,7 @@ namespace Ildasm
"request",
"runtime",
"sealed",
"sequential",
"serializable",
"sizeof",
"shl",

View File

@@ -92,6 +92,10 @@ namespace Ildasm
{
flags |= Flags.Caverbal;
}
else if (IsIldasmOption(arg, "project"))
{
flags |= Flags.Project;
}
else
{
PrintUsage();
@@ -174,6 +178,7 @@ namespace Ildasm
Console.WriteLine("Usage: ikdasm [options] <file_name> [options]");
Console.WriteLine();
Console.WriteLine("Options:");
if (typeof (int).Assembly.GetType ("Mono.Runtime") != null) {
Console.WriteLine (" --out=<file name> Direct output to file rather than stdout.");
Console.WriteLine (" --help Print this help.");
@@ -182,6 +187,7 @@ namespace Ildasm
Console.WriteLine(" /COMPAT=<version> Match ildasm behavior. (<version> = 2.0 | 4.0 | 4.5)");
Console.WriteLine(" /DIFFMODE Remove superficial differences to allow assembly comparisons");
Console.WriteLine(" /CAVERBAL Try to decode custom attribute blobs");
Console.WriteLine(" /PROJECT Project WinMD metadata into .NET format");
}
}
}