MarkupExtension type xml names are omitted their "Extension" parts.

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlLanguage.cs b/mcs/class/System.Xaml/System.Xaml/XamlLanguage.cs
old mode 100644 (file)
new mode 100755 (executable)
index c3c2c87..6b55c0f
--- a/mcs/class/System.Xaml/System.Xaml/XamlLanguage.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlLanguage.cs
@@ -46,6 +46,7 @@ namespace System.Xaml
                {
                        internal SpecialTypeNameList ()
                        {
+                               // FIXME: Extensions can be removed from this list.
                                Add (new SpecialTypeName ("Array", XamlLanguage.Array));
                                Add (new SpecialTypeName ("Member", XamlLanguage.Member));
                                Add (new SpecialTypeName ("Null", XamlLanguage.Null));

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlType.cs b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
old mode 100644 (file)
new mode 100755 (executable)
index a3d4083..b1ef1ae
--- a/mcs/class/System.Xaml/System.Xaml/XamlType.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
@@ -239,6 +239,8 @@ namespace System.Xaml
 
                internal string GetInternalXmlName ()
                {
+                       if (IsMarkupExtension && Name.EndsWith ("Extension", StringComparison.Ordinal))
+                               return Name.Substring (0, Name.Length - 9);
                        var stn = XamlLanguage.SpecialNames.FirstOrDefault (s => s.Type == this);
                        return stn != null ? stn.Name : Name;
                }