diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2019-03-06 10:55:16 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2019-03-06 10:55:16 +0300 |
| commit | e42bf95d14b7ea16abcdff99d769e9f250ec2fd0 (patch) | |
| tree | e98658bd49b77b58df3c021199fa2ffa9ca8b228 /mcs/class/System.Xaml | |
| parent | b31a445e85523a9a41b0975203f7ccd1d6f185a8 (diff) | |
NS2.1 Sync new changes, mobile profiles (#13198)
* Add RuntimeHelpers.GetSubArray. Add missing types to NS's TypeForwarders.cs
* more NS2.1 changes
* ios changes
* Update Decimal (it's now readonly struct)
* fix mcs
* add ROMC.cs
* Fix tests, finish monodroid profile
* Make SRE-not-supported NS2.1 compatible
* Make monotouch_tv and watch NS2.1 compatible
* make some SRE types more NS21 compatible (non-abstract now)
* bump corefx
* More NS21 fixes
* bump coreclr acceptance tests
* Bump API snapshot submodule
* [csproj] Update project files
Diffstat (limited to 'mcs/class/System.Xaml')
| -rwxr-xr-x | mcs/class/System.Xaml/Test/System.Xaml/XamlLanguageTest.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlLanguageTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlLanguageTest.cs index 00af0492096..d4837b16479 100755 --- a/mcs/class/System.Xaml/Test/System.Xaml/XamlLanguageTest.cs +++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlLanguageTest.cs @@ -806,10 +806,7 @@ namespace MonoTests.System.Xaml var l = t.GetAllMembers ().ToArray (); - 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"); + Assert.AreEqual (0, l.Length, "#31"); } void TestXamlTypeExtension (XamlType t, string name, Type underlyingType, Type extReturnType, bool noTypeConverter) |