From fe3e735aa19ba6369a6c18284e3281f6a2c5c0f3 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 22 Sep 2009 13:30:41 +0000 Subject: 2009-09-22 Sebastien Pouliot * PermissionSetAttribute.cs: Don't create a pset for NET_2_1 svn path=/trunk/mcs/; revision=142395 --- mcs/class/corlib/System.Security.Permissions/ChangeLog | 4 ++++ .../corlib/System.Security.Permissions/PermissionSetAttribute.cs | 2 ++ 2 files changed, 6 insertions(+) (limited to 'mcs/class/corlib/System.Security.Permissions') diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog index 77e863b3e17..a2683cb943e 100644 --- a/mcs/class/corlib/System.Security.Permissions/ChangeLog +++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog @@ -1,3 +1,7 @@ +2009-09-22 Sebastien Pouliot + + * PermissionSetAttribute.cs: Don't create a pset for NET_2_1 + 2009-09-18 Sebastien Pouliot * EnvironmentPermissionAttribute.cs, FileIOPermissionAttribute.cs, diff --git a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs index 9613ea34f7a..74ceebd9477 100644 --- a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs @@ -131,6 +131,7 @@ namespace System.Security.Permissions { public PermissionSet CreatePermissionSet () { PermissionSet pset = null; +#if !NET_2_1 if (this.Unrestricted) pset = new PermissionSet (PermissionState.Unrestricted); else { @@ -157,6 +158,7 @@ namespace System.Security.Permissions { } #endif } +#endif return pset; } } -- cgit v1.2.3