* Application.cs: In ProductVersion first try AssemblyFileVersion

before falling back to assembly version. Fixes bug #339787.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
index 6fd94f4bb5630bc88ddb8fcfb86fd948c15bdb98..ba26caac69d3a485c3f7e17efeeadd1355196dc0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
@@ -290,8 +290,16 @@ namespace System.Windows.Forms
                                        as AssemblyInformationalVersionAttribute;
                                if (infoVersion != null)
                                        version = infoVersion.InformationalVersion;
-                               else
-                                       version = assembly.GetName ().Version.ToString ();
+                               else {
+                                       AssemblyFileVersionAttribute fileVersion =
+                                               Attribute.GetCustomAttribute (assembly,
+                                               typeof (AssemblyFileVersionAttribute))
+                                               as AssemblyFileVersionAttribute;
+                                       if (fileVersion != null)
+                                               version = fileVersion.Version;
+                                       else
+                                               version = assembly.GetName ().Version.ToString ();
+                               }
                                return version;
                        }
                }

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index bed02dbfa047896df26a778588b27259424e4e0d..58d8c728deafd1b085edc4047d5632ec4f419d4f 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * Application.cs: In ProductVersion first try AssemblyFileVersion
+       before falling back to assembly version. Fixes bug #339787.
+
 2007-11-08  Andreia Gaita <avidigal@novell.com>
 
        * HtmlElement.cs: Implement InnerText setter.