Author: gert
Date: 2007-11-08 15:29:25 -0500 (Thu, 08 Nov 2007)
New Revision: 89249
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
Log:
* Application.cs: In ProductVersion first try AssemblyFileVersion
before falling back to assembly version. Fixes bug #339787.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
2007-11-08 20:22:12 UTC (rev 89248)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs
2007-11-08 20:29:25 UTC (rev 89249)
@@ -290,8 +290,16 @@
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;
}
}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-11-08 20:22:12 UTC (rev 89248)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-11-08 20:29:25 UTC (rev 89249)
@@ -1,3 +1,8 @@
+2007-11-08 Gert Driesen <[EMAIL PROTECTED]>
+
+ * Application.cs: In ProductVersion first try AssemblyFileVersion
+ before falling back to assembly version. Fixes bug #339787.
+
2007-11-08 Andreia Gaita <[EMAIL PROTECTED]>
* HtmlElement.cs: Implement InnerText setter.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
