Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

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

diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
old mode 100755 (executable)
new mode 100644 (file)
index 8b9c7c5..9e5517b
--- a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
@@ -8,9 +8,7 @@
 // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,8 +30,14 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System.Runtime.InteropServices;
+
 namespace System.Security.Permissions {
 
+#if NET_2_1 && !MONOTOUCH
+       [Obsolete ("CAS support is not available with Silverlight applications.")]
+#endif
+       [ComVisible (true)]
        [Flags]
        [Serializable]
        public enum SecurityPermissionFlag {
@@ -65,15 +69,13 @@ namespace System.Security.Permissions {
                RemotingConfiguration = 0x00000800,
 
                Infrastructure = 0x00001000,
-#if ! NET_1_0
+
                BindingRedirects = 0x00002000,
-#endif
+
                AllFlags = Assertion | UnmanagedCode | SkipVerification | Execution | ControlThread
                        | ControlAppDomain | ControlDomainPolicy | ControlEvidence | ControlPolicy
                        | ControlPrincipal | Infrastructure | RemotingConfiguration | SerializationFormatter
-#if ! NET_1_0
                        | BindingRedirects
-#endif
        } // SecurityPermissionFlag
 
 } // System.Security.Permissions