Changeset 2209

Timestamp:

6/19/2010 10:47:54 AM (2 years ago)

Author:

lowjoel

Message:

Define the GetFileVersion? assembly extension method to query assemblies for their file version (not manifest version, as previously used.) This is important since user-displayed versions should be file versions, not manifest versions used for module loading.

Location:

trunk/eraser

Files:

• Eraser.BlackBox/BlackBox.cs (modified) (2 diffs)
• Eraser.Manager/Plugins.cs (modified) (2 diffs)
• Eraser.Util/Eraser.Util.csproj (modified) (1 diff)
• Eraser.Util/ExtensionMethods/Assembly.cs (added)
• Eraser/Program.cs (modified) (1 diff)
• Eraser/SettingsPanel.cs (modified) (2 diffs)
• Eraser/UpdateForm.cs (modified) (1 diff)

trunk/eraser/Eraser.BlackBox/BlackBox.cs

@@ -45 +45 @@
 
 using Eraser.Util;
+using Eraser.Util.ExtensionMethods;
 using ProgressChangedEventHandler = Eraser.Util.ProgressChangedEventHandler;
 using ProgressChangedEventArgs = Eraser.Util.ProgressChangedEventArgs;
@@ -191 +192 @@
                 stream.WriteLine(separator);
                 stream.WriteLine(string.Format(lineFormat, "Version",
-                    Assembly.GetEntryAssembly().GetName().Version));
+                    Assembly.GetEntryAssembly().GetFileVersion()));
                 StringBuilder commandLine = new StringBuilder();
                 foreach (string param in Environment.GetCommandLineArgs())

trunk/eraser/Eraser.Manager/Plugins.cs

@@ -31 +31 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+
 using Eraser.Util;
+using Eraser.Util.ExtensionMethods;
 
 namespace Eraser.Manager.Plugin
@@ -438 +440 @@
 
                 AssemblyInfo info = new AssemblyInfo();
-                info.Version = assembly.GetName().Version;
+                info.Version = assembly.GetFileVersion();
                 IList<CustomAttributeData> attributes = CustomAttributeData.GetCustomAttributes(assembly);
                 foreach (CustomAttributeData attr in attributes)

trunk/eraser/Eraser.Util/Eraser.Util.csproj

@@ -110 +110 @@
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="ExtensionMethods\Assembly.cs" />
     <Compile Include="FileSize.cs" />
     <Compile Include="Logger.cs" />

trunk/eraser/Eraser/Program.cs

@@ -364 +364 @@
 (c) 2008-2010 The Eraser Project
 Eraser is Open-Source Software: see http://eraser.heidi.ie/ for details.
-", Assembly.GetExecutingAssembly().GetName().Version));
+", BuildInfo.AssemblyFileVersion));
 
             PrintCommandHelp();

trunk/eraser/Eraser/SettingsPanel.cs

@@ -29 +29 @@
 using System.Windows.Forms;
 
+using Microsoft.Win32;
+using System.Globalization;
+using System.Threading;
+
 using Eraser.Manager;
 using Eraser.Manager.Plugin;
-using Microsoft.Win32;
-using System.Globalization;
 using Eraser.Util;
-using System.Threading;
+using Eraser.Util.ExtensionMethods;
 
 namespace Eraser
@@ -79 +81 @@
             item.Group = e.Instance.LoadingPolicy == LoadingPolicy.Core ?
                 pluginsManager.Groups[0] : pluginsManager.Groups[1];
-            item.SubItems.Add(e.Instance.Assembly.GetName().Version.ToString());
+            item.SubItems.Add(e.Instance.Assembly.GetFileVersion().ToString());
             item.SubItems.Add(e.Instance.Assembly.Location);
             item.Tag = e.Instance;

trunk/eraser/Eraser/UpdateForm.cs

@@ -530 +530 @@
                 HttpRequestCacheLevel.Revalidate);
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(
-                new Uri("http://eraser.heidi.ie/scripts/updates?action=listupdates&version=6.1.0.0" /*+
-                    Assembly.GetExecutingAssembly().GetName().Version.ToString()*/));
+                new Uri("http://eraser.heidi.ie/scripts/updates?action=listupdates&version=" +
+                    BuildInfo.AssemblyFileVersion));
 
             using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())