Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs

@@ -34,9 +34,7 @@ namespace System.Runtime.Remoting.Channels.Http
 
 	public class HttpChannel : BaseChannelWithProperties,
 		IChannel, IChannelReceiver, IChannelReceiverHook, IChannelSender
-#if NET_2_0
 		, ISecurableChannel
-#endif
 	{
 		HttpClientChannel client;
 		HttpServerChannel server;
@@ -223,7 +221,6 @@ namespace System.Runtime.Remoting.Channels.Http
 
 		#endregion
 
-#if NET_2_0
 		#region ISecurableChannel
 
 		public bool IsSecured
@@ -233,6 +230,5 @@ namespace System.Runtime.Remoting.Channels.Http
 		}
 
 		#endregion
-#endif
 	}
 }

mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientChannel.cs

@@ -37,9 +37,7 @@ namespace System.Runtime.Remoting.Channels.Http
 
 	public class HttpClientChannel : BaseChannelWithProperties,
 		IChannel, IChannelSender
-#if NET_2_0
 		, ISecurableChannel
-#endif
 	{
 		string name = "http client";
 		int priority = 1;
@@ -270,7 +268,6 @@ namespace System.Runtime.Remoting.Channels.Http
 
 		#endregion
 		
-#if NET_2_0
 		#region ISecurableChannel
 		
 		public bool IsSecured
@@ -282,7 +279,6 @@ namespace System.Runtime.Remoting.Channels.Http
 		}
 		
 		#endregion
-#endif
 		
 		#region Internal properties
 		

mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpClientTransportSink.cs

@@ -137,10 +137,8 @@ namespace System.Runtime.Remoting.Channels.Http
 				request.AllowAutoRedirect = false;
 			if (channel.Credentials != null)
 				request.Credentials = channel.Credentials;
-#if NET_2_0
 			else if (channel.UseDefaultCredentials == true)
 				request.UseDefaultCredentials = true;
-#endif
 			else if (channel.Username != null && channel.Username.Length > 0) {
 				if (channel.Domain != null && channel.Domain.Length > 0) {
 					request.Credentials = new NetworkCredential (channel.Username, channel.Password,

mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpServerChannel.cs

@@ -47,9 +47,6 @@ namespace System.Runtime.Remoting.Channels.Http
 		int port = -1; // querying GetChannelUri () on .NET indicates this is the default value
 		bool suppressChannelData = false;
 		bool useIPAddress = true;
-#if !NET_2_0
-		bool exclusiveAddressUse = true;
-#endif
 		bool wantsToListen = true;
 
 		HttpServerTransportSink sink;
@@ -102,11 +99,6 @@ namespace System.Runtime.Remoting.Channels.Http
 					case "listen":
 						this.wantsToListen = Convert.ToBoolean (property.Value);
 						break;
-#if !NET_2_0
-					case "exclusiveAddressUse":
-						this.exclusiveAddressUse = Convert.ToBoolean (property.Value);
-						break;
-#endif
 					}
 				}
 			}

mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/RemotingHttpListener.cs

@@ -52,10 +52,8 @@ namespace System.Runtime.Remoting.Channels.Http
 			string address = null;
 			if (addr == IPAddress.Any)
 				address = "*";
-#if NET_2_0
 			else if (addr == IPAddress.IPv6Any)
 				address = "*";
-#endif
 			else
 				address = addr.ToString ();