Changeset 11121 for stable/HeuristicLab.Core/3.3

Timestamp:

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

Author:

ascheibe

Message:

#2153 merged r11082, r11113, r11117 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/OperatorExecutionException.cs (modified) (2 diffs)

stable/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)