XData support in XamlXmlWriter.

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
index d00528f3a8ec6c51abaee52d95abfaca964428b7..62ba89f20a15dae2b4daa28514f0fdd7e0667aa9 100755 (executable)
--- a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
@@ -451,6 +451,15 @@ namespace System.Xaml
 
                        string s = GetValueString (xm, value);
 
+                       // It looks like a bad practice, but since .NET disables
+                       // indent around XData, I assume they do this, instead
+                       // of examining valid Text value by creating XmlReader
+                       // and call XmlWriter.WriteNode().
+                       if (xm.DeclaringType == XamlLanguage.XData && xm == XamlLanguage.XData.GetMember ("Text")) {
+                               w.WriteRaw (s);
+                               return;
+                       }
+
                        var state = object_states.Peek ();
                        switch (state.PositionalParameterIndex) {
                        case -1:

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
index 93cee685d2abe90e366cc0df013bd9760e47c7da..2583343347dd7a6887d63aad1de55d1dc6cabdc9 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlWriterTest.cs
@@ -946,7 +946,6 @@ namespace MonoTests.System.Xaml
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void Write_XmlSerializableWrapper ()
                {
                        var obj = new XmlSerializableWrapper (new XmlSerializable ("<root/>"));