Author: gert
Date: 2007-08-23 12:00:58 -0400 (Thu, 23 Aug 2007)
New Revision: 84714

Modified:
   trunk/mcs/tools/al/Al.cs
   trunk/mcs/tools/al/ChangeLog
Log:
* Al.cs: Ignore AssemblyKeyAttribute in template when KeyFile is null
or a zero-length string. Ignore AssemblyKeyNameAtribute in template
when KeyName is null or a zero-length string. Fixes bug #82550.


Modified: trunk/mcs/tools/al/Al.cs
===================================================================
--- trunk/mcs/tools/al/Al.cs    2007-08-23 15:55:55 UTC (rev 84713)
+++ trunk/mcs/tools/al/Al.cs    2007-08-23 16:00:58 UTC (rev 84714)
@@ -556,7 +556,7 @@
                                        Report (1044, String.Format ("Couldn't 
open '{0}' key file.", keyfile));
                                }
 
-#if ONLY_1_1                   
+#if ONLY_1_1
                                AddCattr (typeof (AssemblyKeyFileAttribute),
                                        keyfile);
 #endif
@@ -627,6 +627,9 @@
                                                        // ignore if specified 
on command line
                                                        continue;
                                                AssemblyKeyFileAttribute 
keyFileAttr = (AssemblyKeyFileAttribute) o;
+                                               // ignore null or zero-length 
keyfile
+                                               if (keyFileAttr.KeyFile == null 
|| keyFileAttr.KeyFile.Length == 0)
+                                                       continue;
                                                keyfile = Path.Combine 
(Path.GetDirectoryName(templateFile),
                                                        keyFileAttr.KeyFile);
                                        } else if (o is 
AssemblyDelaySignAttribute) {
@@ -641,6 +644,9 @@
                                                        // ignore if specified 
on command line
                                                        continue;
                                                AssemblyKeyNameAttribute 
keynameAttr = (AssemblyKeyNameAttribute) o;
+                                               // ignore null or zero-length 
keyname
+                                               if (keynameAttr.KeyName == null 
|| keynameAttr.KeyName.Length == 0)
+                                                       continue;
                                                keyname = keynameAttr.KeyName;
                                        }
                                }

Modified: trunk/mcs/tools/al/ChangeLog
===================================================================
--- trunk/mcs/tools/al/ChangeLog        2007-08-23 15:55:55 UTC (rev 84713)
+++ trunk/mcs/tools/al/ChangeLog        2007-08-23 16:00:58 UTC (rev 84714)
@@ -1,3 +1,9 @@
+2007-08-23  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * Al.cs: Ignore AssemblyKeyAttribute in template when KeyFile is null 
+       or a zero-length string. Ignore AssemblyKeyNameAtribute in template
+       when KeyName is null or a zero-length string. Fixes bug #82550.
+
 2007-01-15  Gert Driesen  <[EMAIL PROTECTED]>
 
        * Al.cs: Use DelaySign enum to capture whether a delaysign (+ or -)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to