Browse Source

[System.Runtime.Serialization] Further baby steps

Miguel de Icaza 11 years ago
parent
commit
d16a01fe98

+ 2 - 2
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.dll.sources

@@ -10,8 +10,8 @@ System.Runtime.Serialization.Configuration/ParameterElementCollection.cs
 System.Runtime.Serialization.Configuration/SerializationSectionGroup.cs
 System.Runtime.Serialization.Configuration/TypeElement.cs
 System.Runtime.Serialization.Configuration/TypeElementCollection.cs
-System.Runtime.Serialization/CollectionDataContractAttribute.cs
-System.Runtime.Serialization/ContractNamespaceAttribute.cs
+../../../external/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/CollectionDataContractAttribute.cs
+../../../external/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ContractNamespaceAttribute.cs
 ../../../external/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/DataContractAttribute.cs
 System.Runtime.Serialization/DataContractResolver.cs
 System.Runtime.Serialization/DataContractSerializer.cs

+ 0 - 72
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/CollectionDataContractAttribute.cs

@@ -1,72 +0,0 @@
-//
-// CollectionDataContractAttribute.cs
-//
-// Author:
-//	Atsushi Enomoto <[email protected]>
-//
-// Copyright (C) 2005 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_0
-using System;
-
-namespace System.Runtime.Serialization
-{
-	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct, 
-		Inherited = false, AllowMultiple = false)]
-	public sealed class CollectionDataContractAttribute : Attribute
-	{
-		string name, ns, item_name, key_name, value_name;
-		bool is_reference;
-
-		public CollectionDataContractAttribute ()
-		{
-		}
-
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-
-		public string Namespace {
-			get { return ns; }
-			set { ns = value; }
-		}
-
-		public string ItemName {
-			get { return item_name; }
-			set { item_name = value; }
-		}
-
-		public string KeyName {
-			get { return key_name; }
-			set { key_name = value; }
-		}
-
-		public string ValueName {
-			get { return value_name; }
-			set { value_name = value; }
-		}
-
-		public bool IsReference { get; set; } // new in 3.5 SP1
-	}
-}
-#endif

+ 0 - 54
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ContractNamespaceAttribute.cs

@@ -1,54 +0,0 @@
-//
-// ContractNamespaceAttribute.cs
-//
-// Author:
-//	Atsushi Enomoto <[email protected]>
-//
-// Copyright (C) 2005 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_0
-using System;
-
-namespace System.Runtime.Serialization
-{
-	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Module,
-		Inherited = false, AllowMultiple = true)]
-	public sealed class ContractNamespaceAttribute : Attribute
-	{
-		string clr_ns, contract_ns;
-
-		public ContractNamespaceAttribute (string ns)
-		{
-			contract_ns = ns;
-		}
-
-		public string ClrNamespace {
-			get { return clr_ns; }
-			set { clr_ns = value; }
-		}
-
-		public string ContractNamespace {
-			get { return contract_ns; }
-		}
-	}
-}
-#endif

+ 2 - 2
mcs/class/System.Runtime.Serialization/mobile_System.Runtime.Serialization.dll.sources

@@ -10,8 +10,8 @@ Assembly/AssemblyInfo.cs
 ../System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationWriter.cs
 ../System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonWriter.cs
 ../System.ServiceModel.Web/System.Runtime.Serialization.Json/TypeMap.cs
-System.Runtime.Serialization/CollectionDataContractAttribute.cs
-System.Runtime.Serialization/ContractNamespaceAttribute.cs
+../../../external/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/CollectionDataContractAttribute.cs
+../../../external/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ContractNamespaceAttribute.cs
 ../../../external/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/DataContractAttribute.cs
 System.Runtime.Serialization/DataContractResolver.cs
 System.Runtime.Serialization/DataContractSerializer.cs