diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2009-08-01 21:57:00 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2009-08-01 21:57:00 +0400 |
| commit | 57dea3038aefaa69ee65924bf948bf731f6ad884 (patch) | |
| tree | c0d764a9524d16775097268be081bc708b47ca2e /mcs/class/System.XML/System.Xml | |
| parent | 3fc2ac11bc8766bfc62c0c7a9840bb58c2b2d005 (diff) | |
2009-08-01 Miguel de Icaza <miguel@novell.com>
* Various changes to support the non-XAP XmlSchema resolution on
the Moonlight build.
Major missing feature: WebRequest resolution.
svn path=/trunk/mcs/; revision=139248
Diffstat (limited to 'mcs/class/System.XML/System.Xml')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlTextReader.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlXapResolver.cs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs index 1a1a13e002c..ef3a9b1525e 100644 --- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs @@ -130,7 +130,7 @@ namespace System.Xml internal XmlTextReader (bool dummy, XmlResolver resolver, string url, XmlNodeType fragType, XmlParserContext context) { if (resolver == null) { -#if NET_2_1 +#if NET_2_1 && !MONOTOUCH resolver = new XmlXapResolver (); #else resolver = new XmlUrlResolver (); @@ -958,7 +958,7 @@ namespace System.Xml // These values are never re-initialized. private bool namespaces = true; private WhitespaceHandling whitespaceHandling = WhitespaceHandling.All; -#if NET_2_1 +#if NET_2_1 && !MONOTOUCH private XmlResolver resolver = new XmlXapResolver (); #else private XmlResolver resolver = new XmlUrlResolver (); diff --git a/mcs/class/System.XML/System.Xml/XmlXapResolver.cs b/mcs/class/System.XML/System.Xml/XmlXapResolver.cs index 0272ca4a895..b84a5d1b6ed 100644 --- a/mcs/class/System.XML/System.Xml/XmlXapResolver.cs +++ b/mcs/class/System.XML/System.Xml/XmlXapResolver.cs @@ -31,6 +31,7 @@ using System.IO; using System.Reflection; +#if !MONOTOUCH namespace System.Xml { public class XmlXapResolver : XmlResolver @@ -66,3 +67,4 @@ namespace System.Xml } } } +#endif |