diff options
author | Martin Baulig <martin.baulig@xamarin.com> | 2015-12-12 21:05:39 +0300 |
---|---|---|
committer | Joao Matos <joao@tritao.eu> | 2016-01-05 19:19:35 +0300 |
commit | 9fa16c3adcc69be0dac89fcf60fe34c73a08dc32 (patch) | |
tree | aa2fd86d70b65cf07bc0ef77e07566d99257c64e /mcs/class | |
parent | 9be02d456c3fb527f41f4a2f18b2c9cd76c90ea8 (diff) |
[System]: Only use the 'MONO_SECURITY_ALIAS' conditional to determine whether or not to use 'extern alias MonoSecurity'.
Diffstat (limited to 'mcs/class')
13 files changed, 47 insertions, 48 deletions
diff --git a/mcs/class/System/Mono.Http/NtlmClient.cs b/mcs/class/System/Mono.Http/NtlmClient.cs index b40d601b4b1..00036654b1c 100644 --- a/mcs/class/System/Mono.Http/NtlmClient.cs +++ b/mcs/class/System/Mono.Http/NtlmClient.cs @@ -30,11 +30,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security.Protocol.Ntlm; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security.Protocol.Ntlm; +#else +using Mono.Security.Protocol.Ntlm; #endif using System; diff --git a/mcs/class/System/System.Net/EndPointListener.cs b/mcs/class/System/System.Net/EndPointListener.cs index 8080354f806..9726b91358b 100644 --- a/mcs/class/System/System.Net/EndPointListener.cs +++ b/mcs/class/System/System.Net/EndPointListener.cs @@ -29,11 +29,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security.Authenticode; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security.Authenticode; +#else +using Mono.Security.Authenticode; #endif using System.IO; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs index 007db0a6ac3..15641f26421 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/PublicKey.cs @@ -31,15 +31,15 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -using Mono.Security.Cryptography; -using MSX = Mono.Security.X509; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; using MonoSecurity::Mono.Security.Cryptography; using MSX = MonoSecurity::Mono.Security.X509; +#else +using Mono.Security; +using Mono.Security.Cryptography; +using MSX = Mono.Security.X509; #endif namespace System.Security.Cryptography.X509Certificates { diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs index f072f7759a4..0681e9eb5d7 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs @@ -28,13 +28,13 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -using MX = Mono.Security.X509; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; using MX = MonoSecurity::Mono.Security.X509; +#else +using Mono.Security; +using MX = Mono.Security.X509; #endif using System.Collections; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs index 1b9c70a588f..d2a9b316c4b 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs @@ -31,11 +31,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; +#else +using Mono.Security; #endif using System.Text; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs index fd26add2fe2..afb81cb1ab7 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs @@ -29,16 +29,15 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -using Mono.Security.Cryptography; -using MX = Mono.Security.X509; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; - using MonoSecurity::Mono.Security; using MonoSecurity::Mono.Security.Cryptography; using MX = MonoSecurity::Mono.Security.X509; +#else +using Mono.Security; +using Mono.Security.Cryptography; +using MX = Mono.Security.X509; #endif #endif diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs index 7dfb699ef34..9910f398270 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs @@ -30,11 +30,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using MX = Mono.Security.X509; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MX = MonoSecurity::Mono.Security.X509; +#else +using MX = Mono.Security.X509; #endif using System.Collections; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs index 1312a99d86b..92007a397d4 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs @@ -28,11 +28,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; +#else +using Mono.Security; #endif using System.Text; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs index e7f098dbdf1..704b3d3749f 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs @@ -31,13 +31,13 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -using MX = Mono.Security.X509; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; using MX = MonoSecurity::Mono.Security.X509; +#else +using Mono.Security; +using MX = Mono.Security.X509; #endif using System.Collections; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs index a4b2af18ee0..15de9f7b3cc 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs @@ -30,11 +30,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; +#else +using Mono.Security; #endif using System.Text; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs index 02de8cec747..42b6c6e3d44 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Store.cs @@ -29,11 +29,11 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using MX = Mono.Security.X509; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MX = MonoSecurity::Mono.Security.X509; +#else +using MX = Mono.Security.X509; #endif using System.Security.Permissions; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs index b5a4c23e555..89e7afb963c 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs @@ -30,13 +30,13 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -using Mono.Security.Cryptography; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; using MonoSecurity::Mono.Security.Cryptography; +#else +using Mono.Security; +using Mono.Security.Cryptography; #endif using System.Text; diff --git a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs index 5d0cb711008..99860521102 100644 --- a/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs +++ b/mcs/class/System/System.Security.Cryptography/AsnEncodedData.cs @@ -29,13 +29,13 @@ #if SECURITY_DEP -#if MONOTOUCH || MONODROID -using Mono.Security; -using Mono.Security.Cryptography; -#else +#if MONO_SECURITY_ALIAS extern alias MonoSecurity; using MonoSecurity::Mono.Security; using MonoSecurity::Mono.Security.Cryptography; +#else +using Mono.Security; +using Mono.Security.Cryptography; #endif using System.Security.Cryptography.X509Certificates; |