In System.Xml.Schema:

In .:
2009-04-21  Sebastien Pouliot  <sebastien@ximian.com>

	* System.Xml.Schema/*: Remove (not needed for 2.1 anymore)
	* net_2_1_raw_System.Runtime.Serialization.dll.sources: Remove
	more code duplication for 2.1 and fix the build

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

diff --git a/mcs/class/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/ChangeLog
index 0052324ce8c8bafe481b2cc57ca6eefc28172290..9bf43ac5db4ab3e065143e2e69db3dde9175a5c4 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-21  Sebastien Pouliot  <sebastien@ximian.com> 
+
+       * System.Xml.Schema/*: Remove (not needed for 2.1 anymore)
+       * net_2_1_raw_System.Runtime.Serialization.dll.sources: Remove 
+       more code duplication for 2.1 and fix the build
+
 2009-04-21  Sebastien Pouliot  <sebastien@ximian.com>
 
        * net_2_1_raw_System.Runtime.Serialization.dll.sources: Remove

diff --git a/mcs/class/System.Runtime.Serialization/System.Xml.Schema/ChangeLog b/mcs/class/System.Runtime.Serialization/System.Xml.Schema/ChangeLog
deleted file mode 100644 (file)
index 7182f05..0000000
--- a/mcs/class/System.Runtime.Serialization/System.Xml.Schema/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2008-09-09  Atsushi Enomoto  <atsushi@ximian.com>
-                       Jb Evain  <jbevain@novell.com>
-
-       * XmlSchema.cs: add helper internal class.

diff --git a/mcs/class/System.Runtime.Serialization/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.Runtime.Serialization/System.Xml.Schema/XmlSchema.cs
deleted file mode 100644 (file)
index f1f9610..0000000
--- a/mcs/class/System.Runtime.Serialization/System.Xml.Schema/XmlSchema.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Xml.Schema/XmlSchema.cs
-//
-// Author:
-//     Atsushi Enomoto <atsushi@ximian.com>
-//
-// Copyright (C) 2008 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.
-//
-
-// This is a dummy class that just holds constants
-
-#if NET_2_1
-
-namespace System.Xml.Schema
-{
-       internal class XmlSchema
-       {
-               public const string Namespace = "http://www.w3.org/2001/XMLSchema";
-               public const string InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";
-       }
-}
-#endif

diff --git a/mcs/class/System.Runtime.Serialization/net_2_1_raw_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/net_2_1_raw_System.Runtime.Serialization.dll.sources
index d4d1e801c18e8e2437d092d4e1387b9c00f92cd2..5fd5aa3dab74357a99d3ca81a5ea1663d412d1d1 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/net_2_1_raw_System.Runtime.Serialization.dll.sources
+++ b/mcs/class/System.Runtime.Serialization/net_2_1_raw_System.Runtime.Serialization.dll.sources
@@ -1,5 +1,3 @@
-../../build/common/Consts.cs
-../../build/common/Locale.cs
 Assembly/AssemblyInfo.cs
 System.Runtime.Serialization/CollectionDataContractAttribute.cs
 System.Runtime.Serialization/ContractNamespaceAttribute.cs