Need MONO_X509_ALIAS in _SslState.cs and _SecureChannel.cs.
authorMartin Baulig <martin.baulig@xamarin.com>
Sun, 8 Feb 2015 00:54:27 +0000 (01:54 +0100)
committerMarek Safar <marek.safar@gmail.com>
Mon, 2 May 2016 22:07:48 +0000 (00:07 +0200)
mcs/class/referencesource/System/net/System/Net/SecureProtocols/SslStream.cs
mcs/class/referencesource/System/net/System/Net/SecureProtocols/_SslState.cs
mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs

index 862b5e85f115548ee02bfcfca4f5ce2bc07526d8..4bd201f3fec1eea87aa4294405f8fbfb72886ca1 100644 (file)
@@ -20,6 +20,7 @@ Revision History:
 extern alias PrebuiltSystem;
 using X509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection;
 #endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace System.Net.Security {
 using System;
@@ -30,7 +31,6 @@ using System.Security.Authentication;
 using System.Security.Authentication.ExtendedProtection;
 using System.Security.Permissions;
 using System.Security.Principal;
-using System.Security.Cryptography.X509Certificates;
 using System.Net.Configuration;
 
     [Flags]
index 6e3b791aff8f5479dabbd3bc4bc972cb0eaf6026..d44efd6d68fe380694a73bb1bcb94c6ba8e70658 100644 (file)
@@ -20,11 +20,16 @@ Revision History:
 
 --*/
 #if MONO_FEATURE_NEW_TLS && SECURITY_DEP
+#if MONO_X509_ALIAS
+extern alias PrebuiltSystem;
+using X509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection;
+#endif
+using System.Security.Cryptography.X509Certificates;
+
 namespace System.Net.Security {
     using System;
     using System.IO;
     using System.Threading;
-    using System.Security.Cryptography.X509Certificates;
     using System.Collections;
     using System.Runtime.InteropServices;
     using System.Globalization;
index b4e7e7f643c306dfe8d016f8d6628b066328209e..21bbfd3ea6c385469fee4acb124d7300f2cae406 100644 (file)
@@ -4,6 +4,11 @@
 // </copyright>
 //------------------------------------------------------------------------------
 #if MONO_FEATURE_NEW_TLS && SECURITY_DEP
+#if MONO_X509_ALIAS
+extern alias PrebuiltSystem;
+using X509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace System.Net.Security {
     using System.Diagnostics;
@@ -12,7 +17,6 @@ namespace System.Net.Security {
     using System.Runtime.InteropServices;
     using System.Security.Authentication.ExtendedProtection;
     using System.Security.Cryptography;
-    using System.Security.Cryptography.X509Certificates;
     using System.Text;
     using System.Threading;
     using System.Security.Permissions;