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

@ -31,7 +31,7 @@ using System.ServiceModel.Channels;
using System.ServiceModel.Description;
using System.ServiceModel.Dispatcher;
using System.ServiceModel.Security;
#if !NET_2_1
#if !MOBILE
using System.IdentityModel.Selectors;
using System.IdentityModel.Tokens;
using System.ServiceModel.Security.Tokens;
@ -40,7 +40,7 @@ using System.ServiceModel.Security.Tokens;
namespace System.ServiceModel.Description
{
public class ClientCredentials
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
: IEndpointBehavior
#else
: SecurityCredentialsManager, IEndpointBehavior
@ -58,7 +58,7 @@ namespace System.ServiceModel.Description
initiator = other.initiator.Clone ();
recipient = other.recipient.Clone ();
windows = other.windows.Clone ();
#if !NET_2_1
#if !MOBILE
issued_token = other.issued_token.Clone ();
peer = other.peer.Clone ();
support_interactive = other.support_interactive;
@ -93,7 +93,7 @@ namespace System.ServiceModel.Description
get { return windows; }
}
#if !NET_2_1
#if !MOBILE
IssuedTokenClientCredential issued_token =
new IssuedTokenClientCredential ();
PeerCredential peer = new PeerCredential ();
@ -130,7 +130,7 @@ namespace System.ServiceModel.Description
return new ClientCredentials (this);
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
public override SecurityTokenManager CreateSecurityTokenManager ()
{
return new ClientCredentialsSecurityTokenManager (this);