[bcl] Make mono cas opt-in features instead of opt-out for mobile profiles

[mono.git] / mcs / class / corlib / System.Security / CodeAccessPermission.cs

diff --git a/mcs/class/corlib/System.Security/CodeAccessPermission.cs b/mcs/class/corlib/System.Security/CodeAccessPermission.cs
index 9a9a6aaa34e842c3fd6318319c64e4093e2d0200..34285b39e3a76f00b3659f3148b8467ee6e4ca1e 100644 (file)
--- a/mcs/class/corlib/System.Security/CodeAccessPermission.cs
+++ b/mcs/class/corlib/System.Security/CodeAccessPermission.cs
@@ -52,8 +52,8 @@ namespace System.Security {
                {
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -64,8 +64,8 @@ namespace System.Security {
 
                public abstract IPermission Copy ();
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #endif
                public void Demand ()
                {
@@ -77,8 +77,8 @@ namespace System.Security {
                        new PermissionSet (this).CasOnlyDemand (3);
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -125,8 +125,8 @@ namespace System.Security {
                        return null;
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -135,8 +135,8 @@ namespace System.Security {
                        new PermissionSet (this).PermitOnly ();
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -147,8 +147,8 @@ namespace System.Security {
                        throw new NotImplementedException ();
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -159,8 +159,8 @@ namespace System.Security {
                        throw new NotImplementedException ();
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -171,8 +171,8 @@ namespace System.Security {
                        throw new NotImplementedException ();
                }
 
-#if MOBILE && DISABLE_CAS_USE
-               [Obsolete ("CAS support is removed by linker", true)]
+#if MOBILE
+               [Conditional ("FEATURE_MONO_CAS")]
 #else
                [MonoTODO ("CAS support is experimental (and unsupported). Imperative mode is not implemented.")]
 #endif
@@ -264,5 +264,28 @@ namespace System.Security {
                        msg = String.Format (msg, target.GetType (), expected);
                        throw new ArgumentException (msg, "target");
                }
+
+#if MOBILE
+               // Workaround for CS0629
+               void IStackWalk.Assert ()
+               {
+               }
+
+               void IStackWalk.Deny ()
+               {
+               }
+
+               void IStackWalk.PermitOnly ()
+               {
+               }
+
+               void IStackWalk.Demand ()
+               {
+               }
+
+               void IPermission.Demand ()
+               {
+               }
+#endif
        }
 }