* test-695.cs:

* test-695-2-lib.cs:
* test-695-3.lib.cs: Added test for bug #432423.
* AssemblyBuilder.cs: When assembly is strongnamed, then explicitly
set PublicKey flag. Do not allow AssemblyFlagsAttribute to overwrite
flags value, and ignore PublicKey flag if assembly is not strongnamed.
Fixes bug #432423.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index 62cc7f132fe326e25dda1f4e7ad0721c41266636..fc6dfe02bb3bd9b0d449cd239b8cd9e08be35232 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -186,8 +186,7 @@ namespace System.Reflection.Emit
                        if (n.KeyPair != null) {
                                // full keypair is available (for signing)
                                sn = n.KeyPair.StrongName ();
-                       }
-                       else {
+                       } else {
                                // public key is available (for delay-signing)
                                byte[] pk = n.GetPublicKey ();
                                if ((pk != null) && (pk.Length > 0)) {
@@ -195,6 +194,9 @@ namespace System.Reflection.Emit
                                }
                        }
 
+                       if (sn != null)
+                               flags |= (uint) AssemblyNameFlags.PublicKey;
+
                        this.corlib_internal = corlib_internal;
 
                        basic_init (this);
@@ -885,10 +887,16 @@ namespace System.Reflection.Emit
                                } else if (attrname == "System.Reflection.AssemblyFlagsAttribute") {
                                        data = customBuilder.Data;
                                        pos = 2;
-                                       flags = (uint) data [pos];
+                                       flags |= (uint) data [pos];
                                        flags |= ((uint) data [pos + 1]) << 8;
                                        flags |= ((uint) data [pos + 2]) << 16;
                                        flags |= ((uint) data [pos + 3]) << 24;
+
+#if NET_2_0
+                                       // ignore PublicKey flag if assembly is not strongnamed
+                                       if (sn == null)
+                                               flags &= ~(uint) AssemblyNameFlags.PublicKey;
+#endif
                                }
                        }
 

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 2a375d2c83c29ae440679b17a86210336c955137..17f09fae70c276d789d96d1ce0cc08cab48cc785 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-23  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * AssemblyBuilder.cs: When assembly is strongnamed, then explicitly
+       set PublicKey flag. Do not allow AssemblyFlagsAttribute to overwrite
+       flags value, and ignore PublicKey flag if assembly is not strongnamed.
+       Fixes bug #432423.
+
 2008-11-11 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * ConstructorOnTypeBuilderInst.cs (MetadataToken): Make this property

diff --git a/mcs/tests/ChangeLog b/mcs/tests/ChangeLog
index 2a120987eb05ee4e1ab3472ce9ad576c4ab8c783..59a0aba2cbb995e1fd7efd4b7711346b838f7d58 100644 (file)
--- a/mcs/tests/ChangeLog
+++ b/mcs/tests/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-23  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * test-695.cs:
+       * test-695-2-lib.cs:
+       * test-695-3.lib.cs: Added test for bug #432423.
+
 2008-09-25  Miguel de Icaza  <miguel@novell.com>
 
        * eval-test.cs: Update tasty test, to prevent future generations

diff --git a/mcs/tests/test-695-2-lib.cs b/mcs/tests/test-695-2-lib.cs
new file mode 100644 (file)
index 0000000..0c8b7f9
--- /dev/null
+++ b/mcs/tests/test-695-2-lib.cs
@@ -0,0 +1,5 @@
+// Compiler options: -t:library -keyfile:InternalsVisibleTest.snk
+
+class Foo
+{
+}

diff --git a/mcs/tests/test-695-3-lib.cs b/mcs/tests/test-695-3-lib.cs
new file mode 100644 (file)
index 0000000..5c00d08
--- /dev/null
+++ b/mcs/tests/test-695-3-lib.cs
@@ -0,0 +1,9 @@
+// Compiler options: -t:library
+
+using System.Reflection;
+
+[assembly: AssemblyFlags ((uint) AssemblyNameFlags.PublicKey)]
+
+class Foo
+{
+}

diff --git a/mcs/tests/test-695.cs b/mcs/tests/test-695.cs
new file mode 100644 (file)
index 0000000..ce61432
--- /dev/null
+++ b/mcs/tests/test-695.cs
@@ -0,0 +1,183 @@
+// Compiler options: -r:../class/lib/net_1_1/Mono.Cecil.dll
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Mono.Cecil;
+
+class Program
+{
+       static int Main ()
+       {
+               string basedir = BaseDirectory;
+
+               AssemblyDefinition assembly;
+               Assembly a;
+               AssemblyName an;
+               AssemblyBuilder ab;
+
+               assembly = AssemblyFactory.GetAssembly (Path.Combine (basedir, "test-695-2-lib.dll"));
+               if (assembly.Name.Flags != AssemblyFlags.PublicKey)
+                       return 1;
+               a = Assembly.LoadFrom (Path.Combine (basedir, "test-695-2-lib.dll"));
+               if (a.GetName ().Flags != AssemblyNameFlags.PublicKey)
+                       return 2;
+
+               assembly = AssemblyFactory.GetAssembly (Path.Combine (basedir, "test-695-3-lib.dll"));
+               if (Environment.Version.Major >= 2) {
+                       if (assembly.Name.Flags != AssemblyFlags.SideBySideCompatible)
+                               return 3;
+
+               } else {
+                       if (assembly.Name.Flags != AssemblyFlags.PublicKey)
+                               return 3;
+               }
+               a = Assembly.LoadFrom (Path.Combine (basedir, "test-695-3-lib.dll"));
+               if (a.GetName ().Flags != AssemblyNameFlags.PublicKey)
+                       return 4;
+
+               assembly = AssemblyFactory.GetAssembly (Path.Combine (basedir, "test-695.exe"));
+               if (assembly.Name.Flags != AssemblyFlags.SideBySideCompatible)
+                       return 5;
+               a = Assembly.LoadFrom (Path.Combine (basedir, "test-695.exe"));
+               if (a.GetName ().Flags != AssemblyNameFlags.PublicKey)
+                       return 6;
+
+               an = new AssemblyName ();
+               an.Name = "test-695-4-lib";
+               an.SetPublicKey (publicKey);
+               an.Flags = AssemblyNameFlags.Retargetable;
+
+               ab = AppDomain.CurrentDomain.DefineDynamicAssembly (an,
+                       AssemblyBuilderAccess.Save, basedir);
+               ab.Save ("test-695-4-lib.dll");
+
+               assembly = AssemblyFactory.GetAssembly (Path.Combine (basedir, "test-695-4-lib.dll"));
+               if (assembly.Name.Flags != (AssemblyFlags.PublicKey | AssemblyFlags.Retargetable))
+                       return 7;
+
+               an = new AssemblyName ();
+               an.Name = "test-695-5-lib";
+               an.KeyPair = new StrongNameKeyPair (keyPair);
+               an.Flags = AssemblyNameFlags.Retargetable;
+
+               ab = AppDomain.CurrentDomain.DefineDynamicAssembly (an,
+                       AssemblyBuilderAccess.Save, basedir);
+               ab.Save ("test-695-5-lib.dll");
+
+               assembly = AssemblyFactory.GetAssembly (Path.Combine (basedir, "test-695-5-lib.dll"));
+               if (assembly.Name.Flags != (AssemblyFlags.PublicKey | AssemblyFlags.Retargetable))
+                       return 8;
+               a = Assembly.LoadFrom (Path.Combine (basedir, "test-695-5-lib.dll"));
+               if (a.GetName ().Flags != (AssemblyNameFlags.PublicKey | AssemblyNameFlags.Retargetable))
+                       return 9;
+
+               an = new AssemblyName ();
+               an.Name = "test-695-6-lib";
+               an.KeyPair = new StrongNameKeyPair (keyPair);
+               an.Flags = AssemblyNameFlags.Retargetable;
+
+               ab = AppDomain.CurrentDomain.DefineDynamicAssembly (an,
+                       AssemblyBuilderAccess.Save, basedir);
+               an.Flags = AssemblyNameFlags.None;
+               ab.Save ("test-695-6-lib.dll");
+
+               assembly = AssemblyFactory.GetAssembly (Path.Combine (basedir, "test-695-6-lib.dll"));
+               if (assembly.Name.Flags != (AssemblyFlags.PublicKey | AssemblyFlags.Retargetable))
+                       return 10;
+               a = Assembly.LoadFrom (Path.Combine (basedir, "test-695-6-lib.dll"));
+               if (a.GetName ().Flags != (AssemblyNameFlags.PublicKey | AssemblyNameFlags.Retargetable))
+                       return 11;
+
+               return 0;
+       }
+
+       static string BaseDirectory {
+               get {
+                       string loc = typeof (Program).Assembly.Location;
+                       return Path.GetDirectoryName (loc);
+               }
+       }
+
+       static byte [] publicKey = {
+               0x00, 0x24, 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, 0x94, 0x00,
+               0x00, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00,
+               0x52, 0x53, 0x41, 0x31, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00,
+               0x01, 0x00, 0x3d, 0xbd, 0x72, 0x08, 0xc6, 0x2b, 0x0e, 0xa8,
+               0xc1, 0xc0, 0x58, 0x07, 0x2b, 0x63, 0x5f, 0x7c, 0x9a, 0xbd,
+               0xcb, 0x22, 0xdb, 0x20, 0xb2, 0xa9, 0xda, 0xda, 0xef, 0xe8,
+               0x00, 0x64, 0x2f, 0x5d, 0x8d, 0xeb, 0x78, 0x02, 0xf7, 0xa5,
+               0x36, 0x77, 0x28, 0xd7, 0x55, 0x8d, 0x14, 0x68, 0xdb, 0xeb,
+               0x24, 0x09, 0xd0, 0x2b, 0x13, 0x1b, 0x92, 0x6e, 0x2e, 0x59,
+               0x54, 0x4a, 0xac, 0x18, 0xcf, 0xc9, 0x09, 0x02, 0x3f, 0x4f,
+               0xa8, 0x3e, 0x94, 0x00, 0x1f, 0xc2, 0xf1, 0x1a, 0x27, 0x47,
+               0x7d, 0x10, 0x84, 0xf5, 0x14, 0xb8, 0x61, 0x62, 0x1a, 0x0c,
+               0x66, 0xab, 0xd2, 0x4c, 0x4b, 0x9f, 0xc9, 0x0f, 0x3c, 0xd8,
+               0x92, 0x0f, 0xf5, 0xff, 0xce, 0xd7, 0x6e, 0x5c, 0x6f, 0xb1,
+               0xf5, 0x7d, 0xd3, 0x56, 0xf9, 0x67, 0x27, 0xa4, 0xa5, 0x48,
+               0x5b, 0x07, 0x93, 0x44, 0x00, 0x4a, 0xf8, 0xff, 0xa4, 0xcb };
+
+       static byte [] keyPair = {
+               0x07, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53,
+               0x41, 0x32, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
+               0x3D, 0xBD, 0x72, 0x08, 0xC6, 0x2B, 0x0E, 0xA8, 0xC1, 0xC0,
+               0x58, 0x07, 0x2B, 0x63, 0x5F, 0x7C, 0x9A, 0xBD, 0xCB, 0x22,
+               0xDB, 0x20, 0xB2, 0xA9, 0xDA, 0xDA, 0xEF, 0xE8, 0x00, 0x64,
+               0x2F, 0x5D, 0x8D, 0xEB, 0x78, 0x02, 0xF7, 0xA5, 0x36, 0x77,
+               0x28, 0xD7, 0x55, 0x8D, 0x14, 0x68, 0xDB, 0xEB, 0x24, 0x09,
+               0xD0, 0x2B, 0x13, 0x1B, 0x92, 0x6E, 0x2E, 0x59, 0x54, 0x4A,
+               0xAC, 0x18, 0xCF, 0xC9, 0x09, 0x02, 0x3F, 0x4F, 0xA8, 0x3E,
+               0x94, 0x00, 0x1F, 0xC2, 0xF1, 0x1A, 0x27, 0x47, 0x7D, 0x10,
+               0x84, 0xF5, 0x14, 0xB8, 0x61, 0x62, 0x1A, 0x0C, 0x66, 0xAB,
+               0xD2, 0x4C, 0x4B, 0x9F, 0xC9, 0x0F, 0x3C, 0xD8, 0x92, 0x0F,
+               0xF5, 0xFF, 0xCE, 0xD7, 0x6E, 0x5C, 0x6F, 0xB1, 0xF5, 0x7D,
+               0xD3, 0x56, 0xF9, 0x67, 0x27, 0xA4, 0xA5, 0x48, 0x5B, 0x07,
+               0x93, 0x44, 0x00, 0x4A, 0xF8, 0xFF, 0xA4, 0xCB, 0x73, 0xC0,
+               0x6A, 0x62, 0xB4, 0xB7, 0xC8, 0x92, 0x58, 0x87, 0xCD, 0x07,
+               0x0C, 0x7D, 0x6C, 0xC1, 0x4A, 0xFC, 0x82, 0x57, 0x0E, 0x43,
+               0x85, 0x09, 0x75, 0x98, 0x51, 0xBB, 0x35, 0xF5, 0x64, 0x83,
+               0xC7, 0x79, 0x89, 0x5C, 0x55, 0x36, 0x66, 0xAB, 0x27, 0xA4,
+               0xD9, 0xD4, 0x7E, 0x6B, 0x67, 0x64, 0xC1, 0x54, 0x4E, 0x37,
+               0xF1, 0x4E, 0xCA, 0xB3, 0xE5, 0x63, 0x91, 0x57, 0x12, 0x14,
+               0xA6, 0xEA, 0x8F, 0x8F, 0x2B, 0xFE, 0xF3, 0xE9, 0x16, 0x08,
+               0x2B, 0x86, 0xBC, 0x26, 0x0D, 0xD0, 0xC6, 0xC4, 0x1A, 0x72,
+               0x43, 0x76, 0xDC, 0xFF, 0x28, 0x52, 0xA1, 0xDE, 0x8D, 0xFA,
+               0xD5, 0x1F, 0x0B, 0xB5, 0x4F, 0xAF, 0x06, 0x79, 0x11, 0xEE,
+               0xA8, 0xEC, 0xD3, 0x74, 0x55, 0xA2, 0x80, 0xFC, 0xF8, 0xD9,
+               0x50, 0x69, 0x48, 0x01, 0xC2, 0x5A, 0x04, 0x56, 0xB4, 0x3E,
+               0x24, 0x32, 0x20, 0xB5, 0x2C, 0xDE, 0xBB, 0xBD, 0x13, 0xFD,
+               0x13, 0xF7, 0x03, 0x3E, 0xE3, 0x37, 0x84, 0x74, 0xE7, 0xD0,
+               0x5E, 0x9E, 0xB6, 0x26, 0xAE, 0x6E, 0xB0, 0x55, 0x6A, 0x52,
+               0x63, 0x6F, 0x5A, 0x9D, 0xF2, 0x67, 0xD6, 0x61, 0x4F, 0x7A,
+               0x45, 0xEE, 0x5C, 0x3D, 0x2B, 0x7C, 0xB2, 0x40, 0x79, 0x54,
+               0x84, 0xD1, 0xBE, 0x61, 0x3E, 0x5E, 0xD6, 0x18, 0x8E, 0x14,
+               0x98, 0xFC, 0x35, 0xBF, 0x5F, 0x1A, 0x20, 0x2E, 0x1A, 0xD8,
+               0xFF, 0xC4, 0x6B, 0xC0, 0xC9, 0x7D, 0x06, 0xEF, 0x09, 0xF9,
+               0xF3, 0x69, 0xFC, 0xBC, 0xA2, 0xE6, 0x80, 0x22, 0xB9, 0x79,
+               0x7E, 0xEF, 0x57, 0x9F, 0x49, 0xE1, 0xBC, 0x0D, 0xB6, 0xA1,
+               0xFE, 0x8D, 0xBC, 0xBB, 0xA3, 0x05, 0x02, 0x6B, 0x04, 0x45,
+               0xF7, 0x5D, 0xEE, 0x43, 0x06, 0xD6, 0x9C, 0x94, 0x48, 0x1A,
+               0x0B, 0x9C, 0xBC, 0xB4, 0x4E, 0x93, 0x60, 0x87, 0xCD, 0x58,
+               0xD6, 0x9A, 0x39, 0xA6, 0xC0, 0x7F, 0x8E, 0xFF, 0x25, 0xC1,
+               0xD7, 0x2C, 0xF6, 0xF4, 0x6F, 0x24, 0x52, 0x0B, 0x39, 0x42,
+               0x1B, 0x0D, 0x04, 0xC1, 0x93, 0x2A, 0x19, 0x1C, 0xF0, 0xB1,
+               0x9B, 0xC1, 0x24, 0x6D, 0x1B, 0x0B, 0xDA, 0x1C, 0x8B, 0x72,
+               0x48, 0xF0, 0x3E, 0x52, 0xBF, 0x0A, 0x84, 0x3A, 0x9B, 0xC8,
+               0x6D, 0x13, 0x1E, 0x72, 0xF4, 0x46, 0x93, 0x88, 0x1A, 0x5F,
+               0x4C, 0x3C, 0xE5, 0x9D, 0x6E, 0xBB, 0x4E, 0xDD, 0x5D, 0x1F,
+               0x11, 0x40, 0xF4, 0xD7, 0xAF, 0xB3, 0xAB, 0x9A, 0x99, 0x15,
+               0xF0, 0xDC, 0xAA, 0xFF, 0x9F, 0x2D, 0x9E, 0x56, 0x4F, 0x35,
+               0x5B, 0xBA, 0x06, 0x99, 0xEA, 0xC6, 0xB4, 0x48, 0x51, 0x17,
+               0x1E, 0xD1, 0x95, 0x84, 0x81, 0x18, 0xC0, 0xF1, 0x71, 0xDE,
+               0x44, 0x42, 0x02, 0x06, 0xAC, 0x0E, 0xA8, 0xE2, 0xF3, 0x1F,
+               0x96, 0x1F, 0xBE, 0xB6, 0x1F, 0xB5, 0x3E, 0xF6, 0x81, 0x05,
+               0x20, 0xFA, 0x2E, 0x40, 0x2E, 0x4D, 0xA0, 0x0E, 0xDA, 0x42,
+               0x9C, 0x05, 0xAA, 0x9E, 0xAF, 0x5C, 0xF7, 0x3A, 0x3F, 0xBB,
+               0x91, 0x73, 0x45, 0x27, 0xA8, 0xA2, 0x07, 0x4A, 0xEF, 0x59,
+               0x1E, 0x97, 0x9D, 0xE0, 0x30, 0x5A, 0x83, 0xCE, 0x1E, 0x57,
+               0x32, 0x89, 0x43, 0x41, 0x28, 0x7D, 0x14, 0x8D, 0x8B, 0x41,
+               0x1A, 0x56, 0x76, 0x43, 0xDB, 0x64, 0x86, 0x41, 0x64, 0x8D,
+               0x4C, 0x91, 0x83, 0x4E, 0xF5, 0x6C };
+}