Changeset 11113 for trunk

Timestamp:

07/07/14 15:25:17 (10 years ago)

Author:

ascheibe

Message:

#2153 fixed assembly file version lookup to also work in sandboxes.
FileVersionInfo.GetVersionInfo(..) needs LinkDemand which we don't allow in a Hive sandbox and therefore throws an exceptions. This leads to tasks that get rescheduled or just stay paused on the slave and never get sent back to the server.

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/OperatorExecutionException.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginUpdaterForm.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/AssemblyHelpers.cs (added)
• HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/ErrorHandling.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj (modified) (1 diff)
• 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)

trunk/sources/HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Access {
@@ -72 +73 @@
 
     public static string GetHLVersion() {
-      FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
-      return versionInfo.FileVersion;
+      return AssemblyHelpers.GetFileVersion(Assembly.GetExecutingAssembly());
     }
 

trunk/sources/HeuristicLab.Core/3.3/OperatorExecutionException.cs

@@ -21 +21 @@
 
 using System;
-using System.Diagnostics;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Core {
@@ -34 +34 @@
       get {
         string name = "\"" + op.Name + "\"";
+        var assembly = op.GetType().Assembly;
         if (!op.Name.Equals(op.ItemName)) name += " (" + op.ItemName + ")";
-        if (!string.IsNullOrEmpty(op.GetType().Assembly.Location)) {
-          var fvi = FileVersionInfo.GetVersionInfo(op.GetType().Assembly.Location);
-          name += " [" + fvi.FileName + ": " + fvi.FileVersion + "]";
+        if (!string.IsNullOrEmpty(assembly.Location)) {
+          name += " [" + assembly.Location + ": " + AssemblyHelpers.GetFileVersion(assembly) + "]";
         }
         if (InnerException == null)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -37 +36 @@
       : base() {
       InitializeComponent();
-      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
-      Text = "HeuristicLab Plugin Manager " + pluginInfrastructureVersion.FileVersion;
+      Text = "HeuristicLab Plugin Manager " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
 
       pluginManager.PluginLoaded += pluginManager_PluginLoaded;

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginUpdaterForm.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -39 +38 @@
       : base() {
       InitializeComponent();
-      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
-      Text = "HeuristicLab Plugin Manager " + pluginInfrastructureVersion.FileVersion;
+      Text = "HeuristicLab Plugin Manager " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
       pluginManager.PluginLoaded += pluginManager_PluginLoaded;
       pluginManager.PluginUnloaded += pluginManager_PluginUnloaded;

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/ErrorHandling.cs

@@ -21 +21 @@
 
 using System;
-using System.Diagnostics;
 using System.Windows.Forms;
 
@@ -31 +30 @@
       } else {
         string message =
-          "HeuristicLab version: " + FileVersionInfo.GetVersionInfo(typeof(ErrorHandling).Assembly.Location).FileVersion + Environment.NewLine +
+          "HeuristicLab version: " + AssemblyHelpers.GetFileVersion(typeof(ErrorHandling).Assembly) + Environment.NewLine +
           exception.GetType().Name + ": " + exception.Message + Environment.NewLine +
                          exception.StackTrace;

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj

@@ -215 +215 @@
       <DependentUpon>PluginView.cs</DependentUpon>
     </Compile>
+    <Compile Include="AssemblyHelpers.cs" />
     <Compile Include="CommandLineArgumentHandling\Arguments\OpenArgument.cs" />
     <Compile Include="CommandLineArgumentHandling\Arguments\HideStarterArgument.cs" />

trunk/sources/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);
     }
 

trunk/sources/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 = "";
 

trunk/sources/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";