2009-05-22 Zoltan Varga <vargaz@gmail.com>

	* AssemblyBuilder.cs (.ctor): Error out if the not yet supported
	RunAndCollect flag was given.

	* AssemblyBuilderAccess.cs: Add RunAndCollect flag for net 4.0.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index fc6dfe02bb3bd9b0d449cd239b8cd9e08be35232..b693399762f8ec03c986f3b8c35562fb6a268680 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -162,6 +162,11 @@ namespace System.Reflection.Emit
                                        "access");
 #endif
 
+#if NET_4_0
+                       if ((access & AssemblyBuilderAccess.RunAndCollect) == AssemblyBuilderAccess.RunAndCollect)
+                               throw new NotSupportedException ("RunAndCollect not yet supported.");
+#endif
+
                        name = n.Name;
                        this.access = (uint)access;
                        flags = (uint) n.Flags;

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs
index 963bfcc207832980e5dadc8b1317500c342fb473..34e397d27b15f538f501a32d33c5c22a4c76aa93 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs
@@ -45,6 +45,10 @@ namespace System.Reflection.Emit
 #if NET_2_0
        ,
        ReflectionOnly = 6
+#endif
+#if NET_4_0
+       ,
+       RunAndCollect = 9
 #endif
   }
 }

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 0d891c3e91acb0a78e2026efa7a80d9542904344..bb2175456ceaa754cc0ba69589f78bb95e3bd958 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-22  Zoltan Varga  <vargaz@gmail.com>
+
+       * AssemblyBuilder.cs (.ctor): Error out if the not yet supported 
+       RunAndCollect flag was given.
+
+       * AssemblyBuilderAccess.cs: Add RunAndCollect flag for net 4.0.
+
 2009-03-20  Sebastien Pouliot  <sebastien@ximian.com>
 
        * DynamicMethod.cs (Invoke): Wrap a MethodAccessException inside a