Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -111,7 +111,7 @@ namespace System.ServiceModel.Configuration
else if (identity is X509CertificateEndpointIdentity)
{
X509Certificate2Collection certs = ((X509CertificateEndpointIdentity)identity).Certificates;
#pragma warning suppress 56506 //[....]; this.Certificate can never be null (underlying configuration system guarantees)
#pragma warning suppress 56506 //Microsoft; this.Certificate can never be null (underlying configuration system guarantees)
this.Certificate.EncodedValue = Convert.ToBase64String(certs.Export(certs.Count == 1 ? X509ContentType.SerializedCert : X509ContentType.SerializedStore));
}
}