From 25c6f1460f5f041bfae2e5f0859a82c10e6c6e80 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Wed, 14 Jan 2009 16:37:56 +0000 Subject: [PATCH] 2009-01-14 Sebastien Pouliot * NamespaceHandling.cs: New. Enum for Silverlight 2. Microsoft's System.Xml.Linq.dll (often bundled in XAP files) needs it (or we throw a TypeLoadException). * XmlWriterSettings.cs: Add SL2 specific NamespaceHandling property svn path=/trunk/mcs/; revision=123372 --- mcs/class/System.XML/System.Xml/ChangeLog | 7 +++++ .../System.XML/System.Xml/NamespaceHandling.cs | 35 ++++++++++++++++++++++ .../System.XML/System.Xml/XmlWriterSettings.cs | 4 +++ 3 files changed, 46 insertions(+) create mode 100644 mcs/class/System.XML/System.Xml/NamespaceHandling.cs diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 56cf54b3c86..99da56b3654 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,10 @@ +2009-01-14 Sebastien Pouliot + + * NamespaceHandling.cs: New. Enum for Silverlight 2. Microsoft's + System.Xml.Linq.dll (often bundled in XAP files) needs it (or we + throw a TypeLoadException). + * XmlWriterSettings.cs: Add SL2 specific NamespaceHandling property + 2009-01-08 Atsushi Enomoto * XmlReader.cs : ReadContentAsString() does not reject non-elements. diff --git a/mcs/class/System.XML/System.Xml/NamespaceHandling.cs b/mcs/class/System.XML/System.Xml/NamespaceHandling.cs new file mode 100644 index 00000000000..64f52031dd1 --- /dev/null +++ b/mcs/class/System.XML/System.Xml/NamespaceHandling.cs @@ -0,0 +1,35 @@ +// +// Copyright (C) 2009 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_1 + +namespace System.Xml { + + [Flags] + public enum NamespaceHandling { + Default, + OmitDuplicates = 1, + } +} + +#endif diff --git a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs index ab443e82f4f..f043f5b943f 100644 --- a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs +++ b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs @@ -145,6 +145,10 @@ namespace System.Xml get { return outputMethod; } //set { outputMethod = value; } } +#if NET_2_1 + [MonoTODO] + public NamespaceHandling NamespaceHandling { get; set; } +#endif } } -- 2.11.4.GIT