Merge pull request #496 from nicolas-raoul/unit-test-for-issue2907

[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 dbd51ca..9e5517b
--- a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
@@ -8,38 +8,50 @@
 // URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 
+using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-
-       /// <summary>
-       /// </summary>
+#if NET_2_1 && !MONOTOUCH
+       [Obsolete ("CAS support is not available with Silverlight applications.")]
+#endif
+       [ComVisible (true)]
        [Flags]
+       [Serializable]
        public enum SecurityPermissionFlag {
 
-               /// <summary>
-               /// </summary>
                NoFlags = 0x00000000,
 
-               /// <summary>
-               /// </summary>
                Assertion = 0x00000001,
 
-               /// <summary>
-               /// </summary>
                UnmanagedCode = 0x00000002,
 
-               /// <summary>
-               /// </summary>
                SkipVerification = 0x00000004,
 
-               /// <summary>
-               /// </summary>
                Execution = 0x00000008,
 
-               /// <summary>
-               /// </summary>
                ControlThread = 0x00000010,
 
                ControlEvidence = 0x00000020,
@@ -58,11 +70,12 @@ namespace System.Security.Permissions {
 
                Infrastructure = 0x00001000,
 
-               /// <summary>
-               /// </summary>
+               BindingRedirects = 0x00002000,
+
                AllFlags = Assertion | UnmanagedCode | SkipVerification | Execution | ControlThread
                        | ControlAppDomain | ControlDomainPolicy | ControlEvidence | ControlPolicy
-                       | ControlPrincipal | Infrastructure | RemotingConfiguration | SerializationFormatter,
+                       | ControlPrincipal | Infrastructure | RemotingConfiguration | SerializationFormatter
+                       | BindingRedirects
        } // SecurityPermissionFlag
 
 } // System.Security.Permissions