2009-09-22 Sebastien Pouliot <sebastien@ximian.com>

	* PermissionSetAttribute.cs: Don't create a pset for NET_2_1


svn path=/trunk/mcs/; revision=142395

2 files changed, 6 insertions, 0 deletions

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  <sebastien@ximian.com>
+
+	* PermissionSetAttribute.cs: Don't create a pset for NET_2_1
+
 2009-09-18  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* 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;
 		}
 	}