Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -48,10 +48,19 @@ 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
}
}
}
@ -73,5 +82,17 @@ 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
}
}