Kill the MOONLIGHT define from System.Xml.Linq.

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs
index f9065f65f58af72041146b493432e0d8ce1a4578..4868a8ba409603d0be680b2d7355359bc37ee706 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/SaveOptions.cs
@@ -33,7 +33,7 @@ namespace System.Xml.Linq
        {
                None = 0,
                DisableFormatting = 1,
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0 || MOBILE
                OmitDuplicateNamespaces = 2
 #endif
        }

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
index 40ac74035a09f210dcdb7136eac8804b93913be9..a285e0ab8ba73d41a8bd75d08d037d73673b9bb5 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
@@ -95,9 +95,7 @@ namespace System.Xml.Linq
                public static XDocument Load (string uri, LoadOptions options)
                {
                        XmlReaderSettings s = new XmlReaderSettings ();
-#if !MOONLIGHT
                        s.ProhibitDtd = false; // see XNodeNavigatorTest.MoveToId().
-#endif
                        s.IgnoreWhitespace = (options & LoadOptions.PreserveWhitespace) == 0;
                        using (XmlReader r = XmlReader.Create (uri, s)) {
                                return LoadCore (r, options);
@@ -122,9 +120,7 @@ namespace System.Xml.Linq
                public static XDocument Load (TextReader textReader, LoadOptions options)
                {
                        XmlReaderSettings s = new XmlReaderSettings ();
-#if !MOONLIGHT
                        s.ProhibitDtd = false; // see XNodeNavigatorTest.MoveToId().
-#endif
                        s.IgnoreWhitespace = (options & LoadOptions.PreserveWhitespace) == 0;
                        using (XmlReader r = XmlReader.Create (textReader, s)) {
                                return LoadCore (r, options);

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
index 524324e47f1a341f4403bca6fafda1ebf48c3ea3..d2abc59910f6d69a1ce6893230e58db3f87e7430 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XElement.cs
@@ -407,12 +407,7 @@ namespace System.Xml.Linq
 
                static void DefineDefaultSettings (XmlReaderSettings settings, LoadOptions options)
                {
-#if MOONLIGHT
-                       // 2.1 has a DtdProcessing property which defaults to DtdProcessing.Prohibit
-                       settings.DtdProcessing = DtdProcessing.Parse;
-#else
                        settings.ProhibitDtd = false;
-#endif
 
                        settings.IgnoreWhitespace = (options & LoadOptions.PreserveWhitespace) == 0;
                }
@@ -467,7 +462,7 @@ namespace System.Xml.Linq
                        }
                }
 
-#if MOONLIGHT || MOBILE || NET_4_0
+#if MOBILE || NET_4_0
                public static XElement Load (Stream stream)
                {
                        return Load (stream, LoadOptions.None);
@@ -549,7 +544,7 @@ namespace System.Xml.Linq
 
                        if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
                                s.Indent = true;
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0 || MOBILE
                        if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
                                s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
 #endif
@@ -569,7 +564,7 @@ namespace System.Xml.Linq
                        
                        if ((options & SaveOptions.DisableFormatting) == SaveOptions.None)
                                s.Indent = true;
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0 || MOBILE
                        if ((options & SaveOptions.OmitDuplicateNamespaces) == SaveOptions.OmitDuplicateNamespaces)
                                s.NamespaceHandling |= NamespaceHandling.OmitDuplicates;
 #endif
@@ -583,7 +578,7 @@ namespace System.Xml.Linq
                        WriteTo (writer);
                }
 
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0 || MOBILE
                public void Save (Stream stream)
                {
                        Save (stream, SaveOptions.None);

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs b/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs
index 84cb492334cf8ffe9c05502aac3e32e9ebd328f2..55702bd1c265d7aeb4a4f298f8a81a5723e31659 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs
@@ -24,8 +24,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOONLIGHT
-
 using System;
 using System.IO;
 using System.Text;
@@ -422,5 +420,3 @@ namespace System.Xml.Linq
                }
        }
 }
-
-#endif

diff --git a/mcs/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs b/mcs/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs
index 94139746016ba85832f1dbcf32a4d4708d158cd3..10a91c3030d7dc2f91ea65d0b10cc1d33f9be4b1 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs
@@ -24,8 +24,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOONLIGHT
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -95,5 +93,3 @@ namespace System.Xml.XPath
                }
        }
 }
-
-#endif