Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -1 +1 @@
646380cd40554c9f34cbb50a549f94653c69e20f
79ae69df3d76cff87aefb97754abcf7de3dcedbf

View File

@@ -714,7 +714,9 @@ namespace Ildasm
WriteCallingConvention(lw, mb.CallingConvention);
if (mb is ConstructorInfo)
{
lw.Write("void ");
WriteSignatureType(lw, ((ConstructorInfo)mb).__ReturnParameter.ParameterType);
WriteCustomModifiers(lw, ((ConstructorInfo)mb).__ReturnParameter.__GetCustomModifiers());
lw.Write(" ");
}
else
{

View File

@@ -193,11 +193,15 @@ 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.");
} else {
Console.WriteLine(" /OUT=<file name> Direct output to file rather than to stdout.");
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");
Console.WriteLine (" -assembly Dumps the contents of the Assembly table");
Console.WriteLine (" -assemblyref Dumps the contents of the AssemblyRef table");
Console.WriteLine (" -moduleref Dumps the contents of the ModuleRef table");
} else {
Console.WriteLine(" /OUT=<file name> Direct output to file rather than to stdout.");
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");