Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -1 +1 @@
b7e5c1ad91e7e650b27e4bd270102e6dd61dc752
646380cd40554c9f34cbb50a549f94653c69e20f

View File

@@ -94,28 +94,23 @@ namespace Ildasm
}
else if (IsIldasmOption(arg, "project"))
{
flags |= Flags.Project;
flags |= Flags.Project;
}
else
{
PrintUsage();
return 1;
}
}
else
{
if (inputFile != null)
{
PrintUsage();
return 1;
}
else
{
inputFile = arg;
}
}
}
}
}
else
{
if (inputFile != null)
{
PrintUsage();
return 1;
}
else
{
inputFile = arg;
}
}
}
}
if (inputFile == null)
{
@@ -178,7 +173,6 @@ 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.");