Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions

View File

@@ -805,7 +805,11 @@ namespace MonoTests.System.Xaml
Assert.IsNull (t.MarkupExtensionReturnType, "#29");
var l = t.GetAllMembers ().ToArray ();
Assert.AreEqual (0, l.Length, "#31");
if (underlyingType == typeof (decimal))
Assert.AreEqual (6, l.Length, "#31"); //decimal has 6 internal properties (see Decimal.DecCalc.cs)
else
Assert.AreEqual (0, l.Length, "#31");
}
void TestXamlTypeExtension (XamlType t, string name, Type underlyingType, Type extReturnType, bool noTypeConverter)