From: Martin Baulig <martin.baulig@xamarin.com>
Date: Sun, 8 Feb 2015 00:54:27 +0000 (+0100)
Subject: Need MONO_X509_ALIAS in _SslState.cs and _SecureChannel.cs.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=1228b5b427b23d998fe3132ab9a19e4ed4ff8725;p=mono.git

Need MONO_X509_ALIAS in _SslState.cs and _SecureChannel.cs.
---

diff --git a/mcs/class/referencesource/System/net/System/Net/SecureProtocols/SslStream.cs b/mcs/class/referencesource/System/net/System/Net/SecureProtocols/SslStream.cs
index 862b5e85f11..4bd201f3fec 100644
--- a/mcs/class/referencesource/System/net/System/Net/SecureProtocols/SslStream.cs
+++ b/mcs/class/referencesource/System/net/System/Net/SecureProtocols/SslStream.cs
@@ -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]
diff --git a/mcs/class/referencesource/System/net/System/Net/SecureProtocols/_SslState.cs b/mcs/class/referencesource/System/net/System/Net/SecureProtocols/_SslState.cs
index 6e3b791aff8..d44efd6d68f 100644
--- a/mcs/class/referencesource/System/net/System/Net/SecureProtocols/_SslState.cs
+++ b/mcs/class/referencesource/System/net/System/Net/SecureProtocols/_SslState.cs
@@ -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;
diff --git a/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs b/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs
index b4e7e7f643c..21bbfd3ea6c 100644
--- a/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs
+++ b/mcs/class/referencesource/System/net/System/Net/_SecureChannel.cs
@@ -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;