Imported Upstream version 4.6.0.150

Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7

mcs/class/System/System.Net.Sockets/Socket.cs.REMOVED.git-id

@@ -1 +1 @@
-07896d201380eea623b23d5a0ecfd9365798af18
+f894f490612fc2b6ff9f185bd113be8941234c9b

mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs

@@ -101,7 +101,6 @@ namespace System.Net.Sockets
 			set { remote_ep = value; }
 		}
 
-#if !NET_2_1
 		public IPPacketInformation ReceiveMessageFromPacketInfo {
 			get;
 			private set;
@@ -112,6 +111,7 @@ namespace System.Net.Sockets
 			set;
 		}
 
+#if !NET_2_1
 		public TransmitFileOptions SendPacketsFlags {
 			get;
 			set;
@@ -185,9 +185,7 @@ namespace System.Net.Sockets
 			BufferList = null;
 			RemoteEndPoint = null;
 			UserToken = null;
-#if !NET_2_1
 			SendPacketsElements = null;
-#endif
 		}
 
 		public void Dispose ()

mcs/class/System/System.Net.Sockets/TcpClient.cs

@@ -267,7 +267,7 @@ namespace System.Net.Sockets
 		
 		public void Close ()
 		{
-			((IDisposable) this).Dispose ();
+			Dispose ();
 		}
 
 		public void Connect (IPEndPoint remoteEP)
@@ -382,7 +382,7 @@ namespace System.Net.Sockets
 			return client.BeginConnect (host, port, requestCallback, state);
 		}
 		
-		void IDisposable.Dispose ()
+		public void Dispose ()
 		{
 			Dispose (true);
 			GC.SuppressFinalize (this);

mcs/class/System/System.Net.Sockets/UdpClient.cs

@@ -125,12 +125,10 @@ namespace System.Net.Sockets
 				socket.Bind (localEP);
 		}
 
-#region Close
 		public void Close ()
 		{
-			((IDisposable) this).Dispose ();	
+			Dispose ();
 		}
-#endregion
 #region Connect
 
 		void DoConnect (IPEndPoint endPoint)
@@ -570,7 +568,7 @@ namespace System.Net.Sockets
 
 #endregion
 #region Disposing
-		void IDisposable.Dispose ()
+		public void Dispose ()
 		{
 			Dispose (true);
 			GC.SuppressFinalize (this);