Changeset 2719

Timestamp:

06/03/12 08:08:16 (12 months ago)

Author:

lowjoel

Message:

More changes to fix the Version information to display the File version and not the Assembly Version. Addresses ​http://eraser.heidi.ie/forum/viewtopic.php?f=2&t=8810.

Location:

branches/eraser6/6.0/Eraser

Files:

• Program.cs (modified) (1 diff)
• SettingsPanel.cs (modified) (1 diff)
• UpdateForm.cs (modified) (2 diffs)

branches/eraser6/6.0/Eraser/Program.cs

@@ -1194 +1194 @@
 (c) 2008 The Eraser Project
 Eraser is Open-Source Software: see http://eraser.heidi.ie/ for details.
-", Assembly.GetExecutingAssembly().GetName().Version);
+", FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion);
 
             Console.Out.Flush();

branches/eraser6/6.0/Eraser/SettingsPanel.cs

@@ -79 +79 @@
             item.Group = e.Instance.IsCore ? pluginsManager.Groups[0] :
                 pluginsManager.Groups[1];
-            item.SubItems.Add(e.Instance.Assembly.GetName().Version.ToString());
+            item.SubItems.Add(e.Instance.AssemblyInfo.Version.ToString());
             item.SubItems.Add(e.Instance.Assembly.Location);
             item.Tag = e.Instance;

branches/eraser6/6.0/Eraser/UpdateForm.cs

@@ -35 +35 @@
 using System.Net.Mime;
 using System.Globalization;
+using System.Diagnostics;
 
 namespace Eraser
@@ -533 +534 @@
             HttpWebRequest req = (HttpWebRequest)
                 WebRequest.Create(new Uri("http://eraser.heidi.ie/updates?action=listupdates&" +
-                    "version=" + Assembly.GetExecutingAssembly().GetName().Version.ToString()));
+                    "version=" + FileVersionInfo.GetVersionInfo(
+                        Assembly.GetExecutingAssembly().Location).FileVersion));
             
             using (WebResponse resp = req.GetResponse())