Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
public BasicHttpsBinding (string configurationName)
: this ()
{
@ -102,7 +102,7 @@ namespace System.ServiceModel
SecurityBindingElement element;
switch (Security.Mode) {
case BasicHttpsSecurityMode.TransportWithMessageCredential:
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
throw new NotImplementedException ();
#else
@ -117,7 +117,7 @@ namespace System.ServiceModel
return null;
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
element.SetKeyDerivation (false);
element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
#endif
@ -132,7 +132,7 @@ namespace System.ServiceModel
ReaderQuotas.CopyTo (tm.ReaderQuotas);
return tm;
} else {
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (