Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/build/common/Consts.cs

@@ -34,10 +34,11 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "4.8.0.0";
+	public const string MonoVersion = "5.0.0.0";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
+	public const int MonoCorlibVersion = 1050000000;
 
 #if MOBILE
 	// Versions of .NET Framework for Silverlight 4.0

mcs/build/common/Consts.cs.in

@@ -38,6 +38,7 @@ static class Consts
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
+	public const int MonoCorlibVersion = @MONO_CORLIB_VERSION@;
 
 #if MOBILE
 	// Versions of .NET Framework for Silverlight 4.0

mcs/build/common/SR.cs

@@ -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

mcs/build/common/basic-profile-check.cs

@@ -40,7 +40,7 @@ class X {
 		if (!Version.TryParse (field.GetValue (null) as string, out version))
 			return 4;
 
-		if (version < new Version (3, 8))
+		if (version < new Version (4, 9))
 			return 5;
 
 		return 0;