Merge branch 'master' of http://github.com/mono/mono

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

diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
index f5c1fcb2cb71a1199c53f767ca0c8834c1b0ff27..5f7fbff2d8633920d2992246abc814cf2e67a99b 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
@@ -30,12 +30,10 @@
 //
 
 using System.Runtime.InteropServices;
-\r
-namespace System.Security.Permissions {\r
-\r
-#if NET_2_0
+
+namespace System.Security.Permissions {
+
        [ComVisible (true)]
-#endif
        [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
                         AttributeTargets.Struct | AttributeTargets.Constructor |
                         AttributeTargets.Method, AllowMultiple=true, Inherited=false)]
@@ -47,13 +45,11 @@ namespace System.Security.Permissions {
                private string path;
                private string read;
                private string write;
-#if NET_2_0
                private FileIOPermissionAccess allFiles;
                private FileIOPermissionAccess allLocalFiles;
                private string changeAccessControl;
                private string viewAccessControl;
-               private string viewAndModify;
-#endif
+               //private string viewAndModify;
 
                // Constructor
                public FileIOPermissionAttribute (SecurityAction action) : base (action)
@@ -61,13 +57,9 @@ namespace System.Security.Permissions {
                }
                
                // Properties
-#if NET_2_0
                [Obsolete ("use newer properties")]
-#endif
                public string All {
-#if NET_1_1
                        get { throw new NotSupportedException ("All"); }
-#endif
                        set {
                                append = value; 
                                path = value;
@@ -96,7 +88,6 @@ namespace System.Security.Permissions {
                        set { write = value; }
                }
 
-#if NET_2_0
                public FileIOPermissionAccess AllFiles {
                        get { return allFiles; }
                        set { allFiles = value; }
@@ -126,11 +117,12 @@ namespace System.Security.Permissions {
                                write = value;
                        }
                }
-#endif
-                        
                // Methods
                public override IPermission CreatePermission ()
                {
+#if NET_2_1
+                       return null;
+#else
                        FileIOPermission perm = null;
                        if (this.Unrestricted)
                                perm = new FileIOPermission (PermissionState.Unrestricted);
@@ -146,6 +138,7 @@ namespace System.Security.Permissions {
                                        perm.AddPathList (FileIOPermissionAccess.Write, write);
                        }
                        return perm;
+#endif
                }
        }
 }