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

	* EnvironmentPermissionAttribute.cs, FileIOPermissionAttribute.cs,
	HostProtectionAttribute.cs, ReflectionPermissionAttribute.cs,
	SecurityPermissionAttribute.cs, StrongNamePermissionAttribute.cs: 
	Return a null IPermission for NET_2_1
	* PermissionSetAttribute.cs: Return null when paring from XML for 
	NET_2_1


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

8 files changed, 35 insertions, 1 deletions

diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
index 02c5cd241a3..77e863b3e17 100644
--- a/mcs/class/corlib/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-18  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* EnvironmentPermissionAttribute.cs, FileIOPermissionAttribute.cs,
+	HostProtectionAttribute.cs, ReflectionPermissionAttribute.cs,
+	SecurityPermissionAttribute.cs, StrongNamePermissionAttribute.cs: 
+	Return a null IPermission for NET_2_1
+	* PermissionSetAttribute.cs: Return null when paring from XML for 
+	NET_2_1
+
 2009-07-30  Marek Safar  <marek.safar@gmail.com> 
 
 	* ReflectionPermission.cs: RestrictedMemberAccess can be set.
diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
index acc0624717f..e8f9f0a1d7a 100644
--- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
@@ -75,6 +75,9 @@ namespace System.Security.Permissions {
 		// Methods
 		public override IPermission CreatePermission ()
 		{
+#if NET_2_1
+			return null;
+#else
 			EnvironmentPermission perm = null;
 			if (this.Unrestricted)
 				perm = new EnvironmentPermission (PermissionState.Unrestricted);
@@ -86,6 +89,7 @@ namespace System.Security.Permissions {
 					perm.AddPathList (EnvironmentPermissionAccess.Write, write);
 			}
 			return perm;
+#endif
 		}
 	}
 }
diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
index 91b71b8fc6f..1525858afb1 100644
--- a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
@@ -127,10 +127,12 @@ namespace System.Security.Permissions {
 			}
 		}
 #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 +148,7 @@ namespace System.Security.Permissions {
 					perm.AddPathList (FileIOPermissionAccess.Write, write);
 			}
 			return perm;
+#endif
 		}
 	}
 }	   
diff --git a/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs
index 93fe70a3545..518b0c04499 100644
--- a/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/HostProtectionAttribute.cs
@@ -173,8 +173,12 @@ namespace System.Security.Permissions {
 
 		public override IPermission CreatePermission ()
 		{
+#if NET_2_1
+			return null;
+#else
 			// looks like permission is internal
 			return new HostProtectionPermission (_resources);
+#endif
 		}
 	}
 }
diff --git a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs
index 9022f9e4ce4..9613ea34f7a 100644
--- a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs
@@ -96,6 +96,7 @@ namespace System.Security.Permissions {
 
 		private PermissionSet CreateFromXml (string xml) 
 		{
+#if !NET_2_1
 			SecurityParser sp = new SecurityParser ();
 			try {
 				sp.LoadXml (xml);
@@ -123,6 +124,7 @@ namespace System.Security.Permissions {
 				ps.FromXml (se);
 				return ps;
 			}
+#endif
 			return null;
 		}
 
diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
index 5a7d664c025..cb1da3adac2 100644
--- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
@@ -118,12 +118,16 @@ namespace System.Security.Permissions {
 		// Methods
 		public override IPermission CreatePermission ()
 		{
+#if NET_2_1
+			return null;
+#else
 			ReflectionPermission perm = null;
 			if (this.Unrestricted)
 				perm = new ReflectionPermission (PermissionState.Unrestricted);
 			else
 				perm = new ReflectionPermission (flags);
 			return perm;
+#endif
 		}
 	}
 }
diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs
index e0ef23f66b7..9709e8c5daf 100644
--- a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs
@@ -256,12 +256,16 @@ namespace System.Security.Permissions {
 
 		public override IPermission CreatePermission ()
 		{
+#if NET_2_1
+			return null;
+#else
 			SecurityPermission perm = null;
 			if (this.Unrestricted)
 				perm = new SecurityPermission (PermissionState.Unrestricted);
 			else
 				perm = new SecurityPermission (m_Flags);
 			return perm;
+#endif
 		}
 
 		public SecurityPermissionFlag Flags {
diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
index 66e39b0f5e2..ca2a25add6a 100644
--- a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
@@ -72,6 +72,9 @@ namespace System.Security.Permissions {
 		// Methods
 		public override IPermission CreatePermission ()
 		{
+#if NET_2_1
+			return null;
+#else
 			if (this.Unrestricted)
 				return new StrongNameIdentityPermission (PermissionState.Unrestricted);
 
@@ -89,6 +92,7 @@ namespace System.Security.Permissions {
 				v = new Version (version);
 
 			return new StrongNameIdentityPermission (blob, name, v);
+#endif
 		}
 	}
 }