Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -44,7 +44,9 @@ namespace System.ServiceModel.Channels
{
internal SecurityBindingElement ()
{
#if !XAMMAC_4_5
MessageSecurityVersion = MessageSecurityVersion.Default;
#endif
endpoint = new SupportingTokenParameters ();
#if !MOBILE && !XAMMAC_4_5
DefaultAlgorithmSuite = SecurityAlgorithmSuite.Default;

View File

@ -105,7 +105,7 @@ namespace System.ServiceModel.Channels
return base.BuildChannelFactory<TChannel> (context);
}
#if !MOBILE
#if !MOBILE && !XAMMAC_4_5
public override IChannelListener<TChannel> BuildChannelListener<TChannel> (
BindingContext context)
{