Imported Upstream version 4.6.0.150

Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7

mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddressBuilder.cs

@@ -62,12 +62,12 @@ namespace System.ServiceModel
 			set { uri = value; }
 		}
 
-#if !NET_2_1
 		public EndpointIdentity Identity {
 			get { return identity; }
 			set { identity = value; }
 		}
 
+#if !NET_2_1
 		public XmlDictionaryReader GetReaderAtExtensions ()
 		{
 			if (extension == null)

mcs/class/System.ServiceModel/System.ServiceModel/MessageSecurityOverTcp.cs

@@ -36,7 +36,7 @@ namespace System.ServiceModel
 #endif
 		MessageCredentialType client_credential_type;
 
-		internal MessageSecurityOverTcp ()
+		public MessageSecurityOverTcp ()
 		{
 #if !MOBILE && !XAMMAC_4_5
 			alg_suite = SecurityAlgorithmSuite.Default;

mcs/class/System.ServiceModel/System.ServiceModel/TcpTransportSecurity.cs

@@ -27,6 +27,7 @@
 //
 using System;
 using System.Net.Security;
+using System.Security.Authentication;
 using System.ServiceModel.Security;
 
 namespace System.ServiceModel
@@ -44,5 +45,12 @@ namespace System.ServiceModel
 		public TcpClientCredentialType ClientCredentialType { get; set; }
 
 		public ProtectionLevel ProtectionLevel { get; set; }
+
+		[MonoTODO]
+		public SslProtocols SslProtocols
+		{
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
 	}
 }