Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -21,10 +21,36 @@ static partial class SR
{
return name;
}
internal static string Format(string resourceFormat, params object[] args)
{
if (args != null) {
return string.Format (CultureInfo.InvariantCulture, resourceFormat, args);
}
return resourceFormat;
}
internal static string Format(string resourceFormat, object p1)
{
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1);
}
internal static string Format(string resourceFormat, object p1, object p2)
{
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2);
}
internal static string Format(string resourceFormat, object p1, object p2, object p3)
{
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2, p3);
}
}
#if !INSIDE_CORLIB
namespace System.Runtime.CompilerServices
{
class FriendAccessAllowedAttribute : Attribute
{ }
}
#endif