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

@@ -4,5 +4,7 @@ namespace System.Runtime.Versioning
{
public static readonly bool TargetsAtLeast_Desktop_V4_5 = true;
public static readonly bool TargetsAtLeast_Desktop_V4_5_1 = true;
// should be a property for System.Xml.BinaryCompatibility
public static bool TargetsAtLeast_Desktop_V4_5_2 => true;
}
}

View File

@@ -783,6 +783,10 @@ namespace System
public override string FullName {
get {
// https://bugzilla.xamarin.com/show_bug.cgi?id=57938
if (IsGenericType && ContainsGenericParameters && !IsGenericTypeDefinition)
return null;
string fullName;
// This doesn't need locking
if (type_info == null)