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

	* AssemblyBuilder.cs, ConstructorBuilder.cs, MethodBuilder.cs,
	TypeBuilder.cs: Don't process PermissionSet under NET_2_1

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index 9b4e08bf11b84d43d44f26cec4c58c7e1a83ae59..f7d320e46e523e21ba7a8220991167019e127d8c 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -288,6 +288,7 @@ namespace System.Reflection.Emit
                /// </summary>
                internal void AddPermissionRequests (PermissionSet required, PermissionSet optional, PermissionSet refused)
                {
+#if !NET_2_1
                        if (created)
                                throw new InvalidOperationException ("Assembly was already saved.");
 
@@ -314,6 +315,7 @@ namespace System.Reflection.Emit
                                permissions_refused [0] = new RefEmitPermissionSet (
                                        SecurityAction.RequestRefuse, refused.ToXml ().ToString ());
                        }
+#endif
                }
 
                internal void EmbedResourceFile (string name, string fileName)

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 247791c9aa39c0d991a0051324c6e5f1d6cf543c..a5a29bb1f38b5154878e8235d536f90161dc644d 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-18  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AssemblyBuilder.cs, ConstructorBuilder.cs, MethodBuilder.cs, 
+       TypeBuilder.cs: Don't process PermissionSet under NET_2_1
+
 2009-09-06 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * ConstructorOnTypeBuilderInst.cs (GetParameters): Make it work for

diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
index ebfc113141243821037cad9755bb3e4b6566e89e..bc119495e27cc3774f09709b5e26d9fd611cc223 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
@@ -196,6 +196,7 @@ namespace System.Reflection.Emit {
 
                public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
                {
+#if !NET_2_1
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
@@ -220,6 +221,7 @@ namespace System.Reflection.Emit {
 
                        permissions [permissions.Length - 1] = new RefEmitPermissionSet (action, pset.ToXml ().ToString ());
                        attrs |= MethodAttributes.HasSecurity;
+#endif
                }
 
                public ParameterBuilder DefineParameter (int iSequence, ParameterAttributes attributes, string strParamName)

diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
index 2b2dd48becc242248282c4ad6680ad0e39525726..b4430f09f45ca981afb684bf131c703dfd78972d 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -472,6 +472,7 @@ namespace System.Reflection.Emit
 
                public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
                {
+#if !NET_2_1
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
@@ -496,6 +497,7 @@ namespace System.Reflection.Emit
 
                        permissions [permissions.Length - 1] = new RefEmitPermissionSet (action, pset.ToXml ().ToString ());
                        attrs |= MethodAttributes.HasSecurity;
+#endif
                }
 
 #if NET_2_0

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index 8037c402bbee0e70568a93380ed9896eabe1bc9c..998fea6576ef0508cbf98199985dfcfbf3f898ec 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -261,6 +261,7 @@ namespace System.Reflection.Emit
 
                public void AddDeclarativeSecurity (SecurityAction action, PermissionSet pset)
                {
+#if !NET_2_1
                        if (pset == null)
                                throw new ArgumentNullException ("pset");
                        if ((action == SecurityAction.RequestMinimum) ||
@@ -285,6 +286,7 @@ namespace System.Reflection.Emit
 
                        permissions [permissions.Length - 1] = new RefEmitPermissionSet (action, pset.ToXml ().ToString ());
                        attrs |= TypeAttributes.HasSecurity;
+#endif
                }
 
 #if NET_2_0