Changeset 11121 for stable/HeuristicLab.PluginInfrastructure/3.3/Starter

Timestamp:

07/07/14 17:00:14 (11 years ago)

Author:

ascheibe

Message:

#2153 merged r11082, r11113, r11117 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.PluginInfrastructure/3.3/Starter/AboutDialog.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/Starter/SplashScreen.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs (modified) (3 diffs)

stable/HeuristicLab.PluginInfrastructure/3.3/Starter/AboutDialog.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
@@ -80 +79 @@
 
     private string GetVersion() {
-      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
-      return pluginInfrastructureVersion.FileVersion;
+      return AssemblyHelpers.GetFileVersion(GetType().Assembly);
     }
 

stable/HeuristicLab.PluginInfrastructure/3.3/Starter/SplashScreen.cs

@@ -21 +21 @@
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
@@ -45 +44 @@
       RegisterPluginManagerEventHandlers();
 
-      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
-      versionLabel.Text = "Version " + pluginInfrastructureVersion.FileVersion;
+      versionLabel.Text = "Version " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
       infoLabel.Text = "";
 

stable/HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -60 +59 @@
       smallImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.HeuristicLab.ToBitmap());
       smallImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.UpdateAvailable.ToBitmap());
-      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
-      Text = "HeuristicLab " + pluginInfrastructureVersion.FileVersion;
+      Text = "HeuristicLab " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
 
       string pluginPath = Path.GetFullPath(Application.StartupPath);
@@ -204 +202 @@
 
     private void AddPluginManagerItem() {
-      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
       pluginManagerListViewItem = new ListViewItem(pluginManagerItemName, 0);
       pluginManagerListViewItem.Group = applicationsListView.Groups["Plugin Management"];
-      pluginManagerListViewItem.SubItems.Add(new ListViewItem.ListViewSubItem(pluginManagerListViewItem, pluginInfrastructureVersion.FileVersion));
+      pluginManagerListViewItem.SubItems.Add(new ListViewItem.ListViewSubItem(pluginManagerListViewItem, AssemblyHelpers.GetFileVersion(GetType().Assembly)));
       pluginManagerListViewItem.SubItems.Add(new ListViewItem.ListViewSubItem(pluginManagerListViewItem, "Install, upgrade or delete plugins"));
       pluginManagerListViewItem.ToolTipText = "Install, upgrade or delete plugins";