StaticExtension also puts PositionalParameters (not sure why, but it's like TypeExten...

diff --git a/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs b/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
index 88c7a157a23f491727153d4f1fe37ff549a08d21..b5d7b1dc9abaca116d161c6684f6629e1424a99a 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
+++ b/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
@@ -172,8 +172,8 @@ namespace System.Xaml
 
                public static IEnumerable<XamlMember> GetAllObjectReaderMembers (this XamlType type, object instance)
                {
-                       // FIXME: find out why only TypeExtension yields this directive. Seealso XamlObjectReaderTest
-                       if (type == XamlLanguage.Type) {
+                       // FIXME: find out why only TypeExtension and StaticExtension yield this directive. Seealso XamlObjectReaderTest.Read_CustomMarkupExtension*()
+                       if (type == XamlLanguage.Type || type == XamlLanguage.Static) {
                                yield return XamlLanguage.PositionalParameters;
                                yield break;
                        }

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectReaderTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectReaderTest.cs
index 44d291f856642caec534890c392e59316fb954fa..7d6db50797624c8a1a89c8e91a04f6ef08eae9dd 100644 (file)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectReaderTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlObjectReaderTest.cs
@@ -568,7 +568,6 @@ namespace MonoTests.System.Xaml
                }
 
                [Test] // almost identical to TypeExtension (only type/instance difference)
-               [Category ("NotWorking")]
                public void Read_StaticExtension ()
                {
                        var r = new XamlObjectReader (new StaticExtension ("MyMember"));