From b2387c5864b85d12c1db5f2fd79945b0a535d4aa Mon Sep 17 00:00:00 2001 From: jbevain Date: Mon, 20 Jul 2009 09:32:00 +0000 Subject: [PATCH] avoid using a custom sources file for the net_2_1_raw profile git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@138205 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- class/System.Xml.Linq/ChangeLog | 5 ++++ class/System.Xml.Linq/System.Xml.Linq/ChangeLog | 4 +++ .../System.Xml.Linq/XNodeNavigator.cs | 4 +++ class/System.Xml.Linq/System.Xml.Schema/ChangeLog | 4 +++ .../System.Xml.Schema/Extensions.cs | 3 +++ class/System.Xml.Linq/System.Xml.XPath/ChangeLog | 4 +++ .../System.Xml.Linq/System.Xml.XPath/Extensions.cs | 3 +++ .../net_2_1_raw_System.Xml.Linq.dll.sources | 30 ---------------------- 8 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 class/System.Xml.Linq/net_2_1_raw_System.Xml.Linq.dll.sources diff --git a/class/System.Xml.Linq/ChangeLog b/class/System.Xml.Linq/ChangeLog index af11cfe18f..ffb9018812 100644 --- a/class/System.Xml.Linq/ChangeLog +++ b/class/System.Xml.Linq/ChangeLog @@ -1,5 +1,10 @@ 2009-07-20 Jb Evain + * net_2_1_raw_System.Xml.Linq.dll: delete, and use ifdefs + in the few specific files. + +2009-07-20 Jb Evain + * Makefile: filter the valid profile on the framework version, to make it easier to have custom variants. diff --git a/class/System.Xml.Linq/System.Xml.Linq/ChangeLog b/class/System.Xml.Linq/System.Xml.Linq/ChangeLog index 7f9d2fc759..07260baac8 100644 --- a/class/System.Xml.Linq/System.Xml.Linq/ChangeLog +++ b/class/System.Xml.Linq/System.Xml.Linq/ChangeLog @@ -1,3 +1,7 @@ +2009-07-20 Jb Evain + + * XNodeNavigator.cs: do not compile for a NET_2_1 profile. + 2009-05-07 Sebastien Pouliot * XElement.cs: Use XmlReaderSettings.DtdProcessing property instead diff --git a/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs b/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs index 7691dccc94..fc5aa9da9d 100644 --- a/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs +++ b/class/System.Xml.Linq/System.Xml.Linq/XNodeNavigator.cs @@ -24,6 +24,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NET_2_1 + using System; using System.IO; using System.Text; @@ -384,3 +386,5 @@ namespace System.Xml.Linq } } } + +#endif diff --git a/class/System.Xml.Linq/System.Xml.Schema/ChangeLog b/class/System.Xml.Linq/System.Xml.Schema/ChangeLog index 3fe2e7f868..aa8706bbfb 100644 --- a/class/System.Xml.Linq/System.Xml.Schema/ChangeLog +++ b/class/System.Xml.Linq/System.Xml.Schema/ChangeLog @@ -1,3 +1,7 @@ +2009-07-20 Jb Evain + + * Extensions.cs: do not compile for a NET_2_1 profile. + 2007-05-02 Atsushi Enomoto * Extensions.cs : new stub file. diff --git a/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs b/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs index e5c9cd00c3..fe8a41c091 100644 --- a/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs +++ b/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs @@ -24,6 +24,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NET_2_1 + using System; using System.Xml; using System.Xml.Linq; @@ -83,3 +85,4 @@ namespace System.Xml.Schema } } +#endif diff --git a/class/System.Xml.Linq/System.Xml.XPath/ChangeLog b/class/System.Xml.Linq/System.Xml.XPath/ChangeLog index 4d7a291234..c403ee2420 100644 --- a/class/System.Xml.Linq/System.Xml.XPath/ChangeLog +++ b/class/System.Xml.Linq/System.Xml.XPath/ChangeLog @@ -1,3 +1,7 @@ +2009-07-20 Jb Evain + + * Extensions.cs: do not compile for a NET_2_1 profile. + 2007-05-06 Atsushi Enomoto * Extensions.cs : implemented. diff --git a/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs b/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs index 1120dcf075..a035b99f9f 100644 --- a/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs +++ b/class/System.Xml.Linq/System.Xml.XPath/Extensions.cs @@ -24,6 +24,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !NET_2_1 + using System; using System.Collections.Generic; using System.Xml; @@ -80,3 +82,4 @@ namespace System.Xml.XPath } } +#endif diff --git a/class/System.Xml.Linq/net_2_1_raw_System.Xml.Linq.dll.sources b/class/System.Xml.Linq/net_2_1_raw_System.Xml.Linq.dll.sources deleted file mode 100644 index ed76158f18..0000000000 --- a/class/System.Xml.Linq/net_2_1_raw_System.Xml.Linq.dll.sources +++ /dev/null @@ -1,30 +0,0 @@ -../../build/common/Consts.cs -../../build/common/Locale.cs -../../build/common/MonoTODOAttribute.cs -Assembly/AssemblyInfo.cs -System.Xml.Linq/Extensions.cs -System.Xml.Linq/LoadOptions.cs -System.Xml.Linq/SaveOptions.cs -System.Xml.Linq/XAttribute.cs -System.Xml.Linq/XCData.cs -System.Xml.Linq/XComment.cs -System.Xml.Linq/XContainer.cs -System.Xml.Linq/XDeclaration.cs -System.Xml.Linq/XDocument.cs -System.Xml.Linq/XDocumentType.cs -System.Xml.Linq/XElement.cs -System.Xml.Linq/XIterators.cs -System.Xml.Linq/XName.cs -System.Xml.Linq/XNamespace.cs -System.Xml.Linq/XNode.cs -System.Xml.Linq/XNodeDocumentOrderComparer.cs -System.Xml.Linq/XNodeEqualityComparer.cs -System.Xml.Linq/XNodeReader.cs -System.Xml.Linq/XNodeWriter.cs -System.Xml.Linq/XObject.cs -System.Xml.Linq/XObjectChange.cs -System.Xml.Linq/XObjectChangeEventArgs.cs -System.Xml.Linq/XProcessingInstruction.cs -System.Xml.Linq/XStreamingElement.cs -System.Xml.Linq/XText.cs -System.Xml.Linq/XUtil.cs -- 2.11.4.GIT