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

@@ -34,11 +34,11 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.12.0.234";
public const string MonoVersion = "5.14.0.78";
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 = 1051200002;
public const int MonoCorlibVersion = 1051400003;
#if MOBILE
// Versions of .NET Framework for Silverlight 4.0

View File

@@ -45,6 +45,8 @@ static partial class SR
{
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2, p3);
}
internal static string GetResourceString (string str) => str;
}
#if !INSIDE_CORLIB

View File

@@ -42,9 +42,9 @@ class X {
Version min_mono_version;
#if __MonoCS__
min_mono_version = new Version (5, 11);
min_mono_version = new Version (5, 13);
#else
min_mono_version = new Version (4, 9);
min_mono_version = new Version (5, 10);
#endif
if (version < min_mono_version)