Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions

View File

@ -48,19 +48,10 @@ namespace System {
if (ClassName == null) {
return base.Message;
} else {
#if MONO
string res = ClassName + "." + MemberName;
if (!string.IsNullOrEmpty(signature))
res = string.Format (CultureInfo.InvariantCulture, signature, res);
if (!string.IsNullOrEmpty(_message))
res += " Due to: " + _message;
return res;
#else
// do any desired fixups to classname here.
return Environment.GetResourceString("MissingMethod_Name",
ClassName + "." + MemberName +
(Signature != null ? " " + FormatSignature(Signature) : ""));
#endif
}
}
}
@ -82,17 +73,5 @@ namespace System {
// If ClassName != null, Message will construct on the fly using it
// and the other variables. This allows customization of the
// format depending on the language environment.
#if MONO
// Called from the EE
private MissingMethodException(String className, String methodName, String signature, String message) : base (message)
{
ClassName = className;
MemberName = methodName;
this.signature = signature;
}
[NonSerialized]
string signature;
#endif
}
}