Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs

@@ -29,7 +29,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.IO;
 using System.Xml.Schema;
@@ -956,4 +955,3 @@ namespace System.Web.Services.Description
 	}
 }
 
-#endif

mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileViolation.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Collections.Specialized;
 using System.Web.Services;
@@ -78,4 +77,3 @@ namespace System.Web.Services.Description
 	}
 }
 
-#endif

mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileViolationCollection.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Collections;
 using System.Collections.Generic;
@@ -99,4 +98,3 @@ namespace System.Web.Services.Description
 	}
 }
 
-#endif

mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileViolationEnumerator.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Collections;
 using System.Collections.Generic;
@@ -78,4 +77,3 @@ namespace System.Web.Services.Description
 		}
 	}
 }
-#endif

mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs

@@ -36,19 +36,12 @@ namespace System.Web.Services.Description
 {
 	[XmlFormatExtensionPoint ("Extensions")]
 	public sealed class Binding :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 
 		#region Fields
 
 		ServiceDescriptionFormatExtensionCollection extensions;
-#if !NET_2_0
-		string name;
-#endif
 		OperationBindingCollection operations;
 		ServiceDescription serviceDescription;
 		XmlQualifiedName type;
@@ -60,9 +53,6 @@ namespace System.Web.Services.Description
 		public Binding ()
 		{
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#if !NET_2_0
-			name = String.Empty;
-#endif
 			operations = new OperationBindingCollection (this);
 			serviceDescription = null;
 			type = XmlQualifiedName.Empty;
@@ -74,20 +64,11 @@ namespace System.Web.Services.Description
 
 		[XmlIgnore]
 		public 
-#if NET_2_0
 		override
-#endif
 		ServiceDescriptionFormatExtensionCollection Extensions { 	
 			get { return extensions; }
 		}
 
-#if !NET_2_0
-		[XmlAttribute ("name", DataType = "NCName")]	
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 		[XmlElement ("operation")]
 		public OperationBindingCollection Operations {

mcs/class/System.Web.Services/System.Web.Services.Description/ConformanceChecker.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Xml.Schema;
 using System.Xml.Serialization;
@@ -244,4 +243,3 @@ namespace System.Web.Services.Description
 	}
 }
 
-#endif

mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs

@@ -40,10 +40,8 @@ namespace System.Web.Services.Description {
 
 		XmlElement docElement;
 
-#if NET_2_0
 		XmlAttribute [] extAttributes;
 		XmlSerializerNamespaces namespaces;
-#endif
 
 		#endregion // Fields
 
@@ -82,7 +80,6 @@ namespace System.Web.Services.Description {
 			set { docElement = value; }
 		}
 
-#if NET_2_0
 		[XmlAnyAttribute]
 		public XmlAttribute [] ExtensibleAttributes {
 			get { return extAttributes; }
@@ -103,7 +100,6 @@ namespace System.Web.Services.Description {
 			}
 			set { namespaces = value; }
 		}
-#endif
 
 		#endregion // Properties
 	}

mcs/class/System.Web.Services/System.Web.Services.Description/ExtensionManager.cs

@@ -64,14 +64,12 @@ namespace System.Web.Services.Description
 			RegisterExtensionType (typeof (SoapHeaderBinding));
 //			RegisterExtensionType (typeof (SoapHeaderFaultBinding));
 			RegisterExtensionType (typeof (SoapOperationBinding));
-#if NET_2_0
 			RegisterExtensionType (typeof (Soap12AddressBinding));
 			RegisterExtensionType (typeof (Soap12Binding));
 			RegisterExtensionType (typeof (Soap12BodyBinding));
 			RegisterExtensionType (typeof (Soap12FaultBinding));
 			RegisterExtensionType (typeof (Soap12HeaderBinding));
 			RegisterExtensionType (typeof (Soap12OperationBinding));
-#endif
 
 #if !MOBILE
 			/*
@@ -79,13 +77,8 @@ namespace System.Web.Services.Description
 			 * System.Configuration, so there are no external modules
 			 * defined
 			 */
-#if NET_2_0 
 			foreach (TypeElement el in WebServicesSection.Current.ServiceDescriptionFormatExtensionTypes)
 				RegisterExtensionType (el.Type);
-#else
-			foreach (Type type in WSConfig.Instance.FormatExtensionTypes)
-				RegisterExtensionType (type);
-#endif
 #endif
 			CreateExtensionSerializers ();
 		}
@@ -185,61 +178,28 @@ namespace System.Web.Services.Description
 #else
 		public static ArrayList BuildExtensionImporters ()
 		{
-#if NET_2_0
 			return BuildExtensionList (WebServicesSection.Current.SoapExtensionImporterTypes);
-#else
-			return BuildExtensionList (WSConfig.Instance.ExtensionImporterTypes);
-#endif
 		}
 		
 		public static ArrayList BuildExtensionReflectors ()
 		{
-#if NET_2_0
 			return BuildExtensionList (WebServicesSection.Current.SoapExtensionReflectorTypes);
-#else
-			return BuildExtensionList (WSConfig.Instance.ExtensionReflectorTypes);
-#endif
 		}
 
-#if NET_2_0
 		public static ArrayList BuildExtensionList (TypeElementCollection exts)
-#else
-		public static ArrayList BuildExtensionList (ArrayList exts)
-#endif
 		{
 			ArrayList extensionTypes = new ArrayList ();
 			
 			if (exts != null)
 			{
-#if NET_2_0 
 				foreach (TypeElement econf in exts)
 				{
 					extensionTypes.Add (econf);
 				}
-#else
-				foreach (WSExtensionConfig econf in exts)
-				{
-					bool added = false;
-					for (int n=0; n<extensionTypes.Count && !added; n++)
-					{
-						WSExtensionConfig cureconf = (WSExtensionConfig) extensionTypes [n];
-	
-						if ((econf.Group < cureconf.Group) || ((econf.Group == cureconf.Group) && (econf.Priority < cureconf.Priority))) {
-							extensionTypes.Insert (n, econf);
-							added = true;
-						}
-					}
-					if (!added) extensionTypes.Add (econf);
-				}
-#endif
 			}
 
 			ArrayList extensions = new ArrayList (extensionTypes.Count);
-#if NET_2_0
 			foreach (TypeElement econf in extensionTypes)
-#else
-			foreach (WSExtensionConfig econf in extensionTypes)
-#endif
 				extensions.Add (Activator.CreateInstance (econf.Type));
 				
 			return extensions;

mcs/class/System.Web.Services/System.Web.Services.Description/HttpSimpleProtocolImporter.cs

@@ -70,9 +70,7 @@ namespace System.Web.Services.Description
 			httpBinding = (HttpBinding) Binding.Extensions.Find (typeof(HttpBinding));
 
 			CodeTypeDeclaration codeClass = new CodeTypeDeclaration (ClassName);
-#if NET_2_0
 			codeClass.IsPartial = true;
-#endif
 
 			string location = null;
 			if (Port != null) {
@@ -288,7 +286,6 @@ namespace System.Web.Services.Description
 			return method;
 		}		
 
-#if NET_2_0
 		internal override CodeExpression BuildInvokeAsync (string messageName, CodeArrayCreateExpression paramsArray, CodeExpression delegateField, CodeExpression userStateVar)
 		{
 			HttpOperationBinding httpOper = OperationBinding.Extensions.Find (typeof (HttpOperationBinding)) as HttpOperationBinding;
@@ -307,7 +304,6 @@ namespace System.Web.Services.Description
 			inv2.Parameters.Add (userStateVar);
 			return inv2;
 		}
-#endif
 		
 		protected virtual Type GetInMimeFormatter ()
 		{

mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs

@@ -32,9 +32,7 @@ using System.Xml.Serialization;
 using System.Web.Services.Configuration;
 
 namespace System.Web.Services.Description {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class Import : DocumentableItem {
 
 		#region Fields
@@ -42,9 +40,7 @@ namespace System.Web.Services.Description {
 		string location;
 		string ns;
 		ServiceDescription serviceDescription;
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		#endregion // Fields
 
@@ -52,9 +48,7 @@ namespace System.Web.Services.Description {
 		
 		public Import ()
 		{
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 			location = String.Empty;
 			ns = String.Empty;
 			serviceDescription = null;
@@ -81,12 +75,10 @@ namespace System.Web.Services.Description {
 			get { return serviceDescription; }
 		}
 
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions { 
 			get { return extensions; }
 		}
-#endif
 
 		#endregion // Properties
 

mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs

@@ -35,26 +35,15 @@ using System.Xml.Serialization;
 
 namespace System.Web.Services.Description 
 {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class Message :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 		#region Fields
 
-#if !NET_2_0
-		string name;
-#endif
 		MessagePartCollection parts;
 		ServiceDescription serviceDescription;
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		#endregion // Fields
 
@@ -62,12 +51,7 @@ namespace System.Web.Services.Description
 		
 		public Message ()
 		{
-#if !NET_2_0
-			name = String.Empty;
-#endif
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 			parts = new MessagePartCollection (this);
 			serviceDescription = null;
 		}
@@ -76,13 +60,6 @@ namespace System.Web.Services.Description
 
 		#region Properties
 
-#if !NET_2_0
-		[XmlAttribute ("name", DataType = "NCName")]
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 		[XmlElement ("part")]
 		public MessagePartCollection Parts {
@@ -94,12 +71,10 @@ namespace System.Web.Services.Description
 			get { return serviceDescription; }
 		}
 
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
-#endif
 
 		#endregion // Properties
 

mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs

@@ -34,18 +34,11 @@ using System.Xml.Serialization;
 namespace System.Web.Services.Description
 {
 	public abstract class MessageBinding :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 
 		#region Fields
 
-#if !NET_2_0
-		string name;
-#endif
 		OperationBinding operationBinding;
 
 		#endregion // Fields
@@ -60,19 +53,6 @@ namespace System.Web.Services.Description
 
 		#region Properties
 
-#if !NET_2_0
-		[XmlIgnore]
-		public abstract ServiceDescriptionFormatExtensionCollection Extensions { 	
-			get;
-		}
-
-//		[DefaultValue (null)]
-		[XmlAttribute ("name", DataType = "NMTOKEN")]	
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 //		[XmlIgnore]
 		public OperationBinding OperationBinding {

mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs

@@ -34,28 +34,17 @@ using System.Web.Services.Configuration;
 
 namespace System.Web.Services.Description 
 {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class MessagePart :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 
 		#region Fields
 
 		XmlQualifiedName element;
 		Message message;
-#if !NET_2_0
-		string name;
-#endif
 		XmlQualifiedName type;
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		#endregion // Fields
 
@@ -65,13 +54,8 @@ namespace System.Web.Services.Description
 		{
 			element = XmlQualifiedName.Empty;
 			message = null;
-#if !NET_2_0
-			name = String.Empty;
-#endif
 			type = XmlQualifiedName.Empty;
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 		}
 		
 		#endregion // Constructors
@@ -89,13 +73,6 @@ namespace System.Web.Services.Description
 			get { return message; }
 		}
 	
-#if !NET_2_0
-		[XmlAttribute ("name", DataType = "NMTOKEN")]
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 		[XmlAttribute ("type")]
 		public XmlQualifiedName Type {
@@ -111,12 +88,10 @@ namespace System.Web.Services.Description
 			get { return element != null && element != XmlQualifiedName.Empty; }
 		}
 
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
-#endif
 
 		#endregion // Properties
 

mcs/class/System.Web.Services/System.Web.Services.Description/NamedItem.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 namespace System.Web.Services.Description 
 {
@@ -48,4 +47,3 @@ namespace System.Web.Services.Description
 	}
 }
 
-#endif

mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs

@@ -36,28 +36,17 @@ using System.Web.Services.Configuration;
 
 namespace System.Web.Services.Description 
 {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class Operation :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 		#region Fields
 
 		OperationFaultCollection faults;
 		OperationMessageCollection messages;
-#if !NET_2_0
-		string name;
-#endif
 		string[] parameterOrder;
 		PortType portType;
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		#endregion // Fields
 
@@ -67,14 +56,9 @@ namespace System.Web.Services.Description
 		{
 			faults = new OperationFaultCollection (this);
 			messages = new OperationMessageCollection (this);
-#if !NET_2_0
-			name = String.Empty;
-#endif
 			parameterOrder = null;
 			portType = null;
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 		}
 		
 		#endregion // Constructors
@@ -92,13 +76,6 @@ namespace System.Web.Services.Description
 			get { return messages; }
 		}
 
-#if !NET_2_0
-		[XmlAttribute ("name", DataType = "NCName")]
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 		[XmlIgnore]
 		public string[] ParameterOrder {
@@ -133,12 +110,10 @@ namespace System.Web.Services.Description
 			get { return portType; }
 		}
 
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
-#endif
 
 		#endregion // Properties
 

mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs

@@ -34,11 +34,7 @@ using System.Xml.Serialization;
 namespace System.Web.Services.Description {
 	[XmlFormatExtensionPoint ("Extensions")]
 	public sealed class OperationBinding :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 		#region Fields
 
@@ -46,9 +42,6 @@ namespace System.Web.Services.Description {
 		ServiceDescriptionFormatExtensionCollection extensions;
 		FaultBindingCollection faults;
 		InputBinding input;
-#if !NET_2_0
-		string name;
-#endif
 		OutputBinding output;
 
 		#endregion // Fields
@@ -60,9 +53,6 @@ namespace System.Web.Services.Description {
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
 			faults = new FaultBindingCollection (this);
 			input = null;
-#if !NET_2_0
-			name = String.Empty;
-#endif
 			output = null;
 		}
 		
@@ -77,9 +67,7 @@ namespace System.Web.Services.Description {
 
 		[XmlIgnore]
 		public 
-#if NET_2_0
 		override
-#endif
 		ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
@@ -99,13 +87,6 @@ namespace System.Web.Services.Description {
 			}
 		}
 
-#if !NET_2_0
-		[XmlAttribute ("name", DataType = "NCName")]
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 		[XmlElement ("output")]
 		public OutputBinding Output {

mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs

@@ -35,28 +35,20 @@ using System.Web.Services.Configuration;
 using System.Xml.Serialization;
 
 namespace System.Web.Services.Description {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class OperationFault : OperationMessage {
 		
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		public OperationFault ()
 		{
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 		}
 		
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
-#endif
 
 	}
 }

mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs

@@ -34,28 +34,20 @@ using System.Web.Services.Configuration;
 using System.Xml.Serialization;
 
 namespace System.Web.Services.Description {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class OperationInput : OperationMessage {
 		
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		public OperationInput ()
 		{
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 		}
 		
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
-#endif
 
 	}
 }

mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs

@@ -35,18 +35,11 @@ using System.Xml.Serialization;
 namespace System.Web.Services.Description
 {
 	public abstract class OperationMessage :
-#if NET_2_0
 		NamedItem
-#else
-		DocumentableItem 
-#endif
 	{
 		#region Fields
 
 		XmlQualifiedName message;
-#if !NET_2_0
-		string name;
-#endif
 		Operation operation;
 
 		#endregion // Fields
@@ -69,13 +62,6 @@ namespace System.Web.Services.Description
 			set { message = value; }
 		}
 
-#if !NET_2_0
-		[XmlAttribute ("name", DataType = "NMTOKEN")]
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-#endif
 
 //		[XmlIgnore]
 		public Operation Operation {

mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs

@@ -33,28 +33,20 @@ using System.Web.Services.Configuration;
 using System.Xml.Serialization;
 
 namespace System.Web.Services.Description {
-#if NET_2_0
 	[XmlFormatExtensionPoint ("Extensions")]
-#endif
 	public sealed class OperationOutput : OperationMessage {
 
-#if NET_2_0
 		ServiceDescriptionFormatExtensionCollection extensions;
-#endif
 
 		public OperationOutput ()
 		{
-#if NET_2_0
 			extensions = new ServiceDescriptionFormatExtensionCollection (this);
-#endif
 		}
 		
-#if NET_2_0
 		[XmlIgnore]
 		public override ServiceDescriptionFormatExtensionCollection Extensions {
 			get { return extensions; }
 		}
-#endif
 
 	}
 }