2004-08-13 Sebastien Pouliot <sebastien@ximian.com>

	* AssemblyBuilder.cs: (Partly) Fix delay-signing issue (#56621) when
	MCS is used on the MS runtime (other part of the fix is for MCS).

svn path=/branches/mono-1-0/mcs/; revision=32305

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index ebe864104691e6a174db24d5e84403dab7f6d818..344395be1a3cce5f3da9ddbe27adaaaa162e062c 100755 (executable)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -131,8 +131,16 @@ namespace System.Reflection.Emit {
                        }
 
                        if (n.KeyPair != null) {
+                               // full keypair is available (for signing)
                                sn = n.KeyPair.StrongName ();
                        }
+                       else {
+                               // public key is available (for delay-signing)
+                               byte[] pk = n.GetPublicKey ();
+                               if ((pk != null) && (pk.Length > 0)) {
+                                       sn = new Mono.Security.StrongName (pk);
+                               }
+                       }
 
                        basic_init (this);
                }

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 4a3fa12c3b039fafbea4e735eb33c2d01c11d2c7..0f117fa51cfcaa304d5fbd66271efc794db731a1 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-13  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AssemblyBuilder.cs: (Partly) Fix delay-signing issue (#56621) when 
+       MCS is used on the MS runtime (other part of the fix is for MCS).
+
 2004-07-24  Martin Baulig  <martin@ximian.com>
 
        * TypeBuilder.cs (TypeBuilder.UnspecifiedTypeSize): Set this to 0