use MOONLIGHT symbol

svn path=/trunk/mcs/; revision=153670

diff --git a/mcs/class/corlib/Mono.Security.X509/ChangeLog b/mcs/class/corlib/Mono.Security.X509/ChangeLog
index 23e3e27ca28435513fbb3a4d9e81a380d0ca9306..96c08c9e9a5efb34db298e3b77c608b87912d6e5 100644 (file)
--- a/mcs/class/corlib/Mono.Security.X509/ChangeLog
+++ b/mcs/class/corlib/Mono.Security.X509/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * X509Certificate.cs: use MOONLIGHT symbol to disambiguate
+       MonoTouch and Moonlight code.
+
 2009-04-30  Sebastien Pouliot  <sebastien@ximian.com> 
 
        * X509Certificate.cs: Adapt to work with only [DSA|RSA]Managed when

diff --git a/mcs/class/corlib/Mono.Security.X509/X509Certificate.cs b/mcs/class/corlib/Mono.Security.X509/X509Certificate.cs
index fd8d8d9164c6580ba7ad0aafa1e540c6d5997a64..e1f5f9b2286423f8f11b15051ef38e4ac971b6b4 100644 (file)
--- a/mcs/class/corlib/Mono.Security.X509/X509Certificate.cs
+++ b/mcs/class/corlib/Mono.Security.X509/X509Certificate.cs
@@ -267,7 +267,7 @@ namespace Mono.Security.X509 {
                                        // BUG: MS BCL 1.0 can't import a key which 
                                        // isn't the same size as the one present in
                                        // the container.
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
                                        _dsa = new DSAManaged (dsaParams.Y.Length << 3);
 #else
                                        _dsa = (DSA) new DSACryptoServiceProvider (dsaParams.Y.Length << 3);
@@ -367,7 +367,7 @@ namespace Mono.Security.X509 {
                                        // isn't the same size as the one present in
                                        // the container.
                                        int keySize = (rsaParams.Modulus.Length << 3);
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
                                        _rsa = new RSAManaged (keySize);
 #else
                                        _rsa = (RSA) new RSACryptoServiceProvider (keySize);
@@ -544,7 +544,7 @@ namespace Mono.Security.X509 {
 
                public bool CheckSignature (byte[] hash, string hashAlgorithm, byte[] signature) 
                {
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
                        string hashName = GetHashNameFromOID (hashAlgorithm);
                        HashAlgorithm algo = HashAlgorithm.Create (hashName);
                        return PKCS1.Verify_v15 (RSA, algo, hash, signature);

diff --git a/mcs/class/corlib/System.Security/ChangeLog b/mcs/class/corlib/System.Security/ChangeLog
index 16023fc31ae791a431739ea3029348d3d526d279..450b779bc07b2690e13f76ef3c1d477a74febb9e 100644 (file)
--- a/mcs/class/corlib/System.Security/ChangeLog
+++ b/mcs/class/corlib/System.Security/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * SecurityTransparentAttribute.cs
+       * SecurityFrame.cs
+       * IPermission.cs
+       * SecurityManager.cs
+       * SecurityManager_2_1.cs
+       * SecuritySafeCriticalAttribute.cs:
+               use MOONLIGHT symbol to disambiguate MonoTouch and Moonlight code.
+
 2009-10-30     Marek Safar  <marek.safar@gmail.com>
 
        * SecurityRuleSet.cs, SecurityRulesAttribute.cs: Implemented.

diff --git a/mcs/class/corlib/System.Security/IPermission.cs b/mcs/class/corlib/System.Security/IPermission.cs
index 4155b32463d48b8310fbb632a7f064b9e392098d..d045a2a9498daffd67a0e13d49852c6a5e9cd44b 100644 (file)
--- a/mcs/class/corlib/System.Security/IPermission.cs
+++ b/mcs/class/corlib/System.Security/IPermission.cs
@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 namespace System.Security {
 
        [ComVisible (true)]
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
        public interface IPermission {
 #else
        public interface IPermission : ISecurityEncodable {

diff --git a/mcs/class/corlib/System.Security/SecurityFrame.cs b/mcs/class/corlib/System.Security/SecurityFrame.cs
index 404ada19995cefa1ede28c034404ace3905772f9..340c8764386c62a6dc3b0e4aa48b85d5a2c48895 100644 (file)
--- a/mcs/class/corlib/System.Security/SecurityFrame.cs
+++ b/mcs/class/corlib/System.Security/SecurityFrame.cs
@@ -53,7 +53,7 @@ namespace System.Security {
        }
 #pragma warning restore 649    
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
        internal struct SecurityFrame {
 
                private AppDomain _domain;

diff --git a/mcs/class/corlib/System.Security/SecurityManager.cs b/mcs/class/corlib/System.Security/SecurityManager.cs
index 7040a08128fe7b361fd958c0c49575fae96df782..531b5439a410f1a87bf772c47752c13c442eb1e6 100644 (file)
--- a/mcs/class/corlib/System.Security/SecurityManager.cs
+++ b/mcs/class/corlib/System.Security/SecurityManager.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
 
 using System.Collections;
 using System.Globalization;

diff --git a/mcs/class/corlib/System.Security/SecurityManager_2_1.cs b/mcs/class/corlib/System.Security/SecurityManager_2_1.cs
index 7e726a84bbf0a9a19bbc53e8fbed2e0f1504ea6c..2b52af6b6e6d7656c6e85e426efa05e74aa534ba 100644 (file)
--- a/mcs/class/corlib/System.Security/SecurityManager_2_1.cs
+++ b/mcs/class/corlib/System.Security/SecurityManager_2_1.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_1 && !MONOTOUCH
+#if MOONLIGHT
 
 using System.Reflection;
 using System.Runtime.CompilerServices;

diff --git a/mcs/class/corlib/System.Security/SecuritySafeCriticalAttribute.cs b/mcs/class/corlib/System.Security/SecuritySafeCriticalAttribute.cs
index 0b641438a43102eb6bbfc4ae378ae7a1ecc3510e..7524ec55459d9fe6b3b67b679b9e544d992ad77d 100644 (file)
--- a/mcs/class/corlib/System.Security/SecuritySafeCriticalAttribute.cs
+++ b/mcs/class/corlib/System.Security/SecuritySafeCriticalAttribute.cs
@@ -28,7 +28,7 @@
 
 namespace System.Security {
 
-#if !NET_2_1 || MONOTOUCH
+#if !MOONLIGHT
        [MonoTODO ("Only supported by the runtime when CoreCLR is enabled")]
 #endif
        [AttributeUsage (AttributeTargets.All, AllowMultiple=false, Inherited=false)]

diff --git a/mcs/class/corlib/System.Security/SecurityTransparentAttribute.cs b/mcs/class/corlib/System.Security/SecurityTransparentAttribute.cs
index f5190aece2763bfa0d09c69399bda4a5a3d98791..ef89603dbf601ebe43f225e7acfc306d4a00189d 100644 (file)
--- a/mcs/class/corlib/System.Security/SecurityTransparentAttribute.cs
+++ b/mcs/class/corlib/System.Security/SecurityTransparentAttribute.cs
@@ -28,7 +28,7 @@
 
 namespace System.Security {
 
-#if !NET_2_1 || MONOTOUCH
+#if MOONLIGHT
        [MonoTODO ("Only supported by the runtime when CoreCLR is enabled")]
 #endif
        [AttributeUsage (AttributeTargets.Assembly, AllowMultiple=false, Inherited=false)]