2010-04-21 Sebastien Pouliot <sebastien@ximian.com>

	* XDocument.cs: Don't use XmlReaderSettings.ProhibitDtd when
	building Moonlight SDK assemblies

svn path=/trunk/mcs/; revision=155877

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq/ChangeLog b/mcs/class/System.Xml.Linq/System.Xml.Linq/ChangeLog
index e21d7728f2e24e2a5dcedf4c990951121331483f..d65d2ac63693d1b426316106e10595ccf3b4a7bf 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/ChangeLog
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * XDocument.cs: Don't use XmlReaderSettings.ProhibitDtd when 
+       building Moonlight SDK assemblies
+
 2010-04-21  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XDocument.cs : don't prohibit DTD.

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 2255eae5bf18025d48188bb7eceed63046e5dca1..32f5f7e61af166c032eea303b8986bf0e5910d7d 100644 (file)
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq/XDocument.cs
@@ -119,7 +119,9 @@ namespace System.Xml.Linq
                public static XDocument Load (TextReader reader, 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 (reader, s)) {
                                return LoadCore (r, options);