2005-03-01 Zoltan Varga <vargaz@freemail.hu>

	* Al.cs: Algid and Flags should be specified in hexadecimal. Fixes
	#72282.

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

diff --git a/mcs/tools/al/Al.cs b/mcs/tools/al/Al.cs
index 81b4e25cb11222f43f7de4a71c6dd8d8b20e7dda..87b01bac34cb37925285bed32cc97c3fe930080f 100644 (file)
--- a/mcs/tools/al/Al.cs
+++ b/mcs/tools/al/Al.cs
@@ -179,7 +179,10 @@ namespace Mono.AssemblyLinker
                                        if (arg == null)
                                                ReportMissingArgument (opt);
                                        try {
-                                               int val = Int32.Parse (arg);
+                                               string realArg = arg;
+                                               if (realArg.StartsWith ("0x"))
+                                                       realArg = realArg.Substring (2);
+                                               uint val = Convert.ToUInt32 (realArg, 16);
                                                AddCattr (typeof (AssemblyAlgorithmIdAttribute), typeof (uint), val);
                                        }
                                        catch (Exception) {
@@ -262,7 +265,10 @@ namespace Mono.AssemblyLinker
                                        if (arg == null)
                                                ReportMissingArgument (opt);
                                        try {
-                                               int val = Int32.Parse (arg);
+                                               string realArg = arg;
+                                               if (realArg.StartsWith ("0x"))
+                                                       realArg = realArg.Substring (2);
+                                               uint val = Convert.ToUInt32 (realArg, 16);
                                                AddCattr (typeof (AssemblyFlagsAttribute), typeof (uint), val);
                                        }
                                        catch (Exception) {

diff --git a/mcs/tools/al/ChangeLog b/mcs/tools/al/ChangeLog
index d6f32aa240d8d7c64a1d8b6eb4a8b1f1d6ac085e..1ece9a06eaa3b51df42b67443d40fcc086373543 100644 (file)
--- a/mcs/tools/al/ChangeLog
+++ b/mcs/tools/al/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-01  Zoltan Varga  <vargaz@freemail.hu>
+
+       * Al.cs: Algid and Flags should be specified in hexadecimal. Fixes
+       #72282.
+
 2005-01-30  Zoltan Varga  <vargaz@freemail.hu>
 
        * Al.cs: Fix spitting of newlines.