Changeset 13353

Timestamp:

11/24/15 11:58:27 (8 years ago)

Author:

gkronber

Message:

#2522: added assembly attribute for release code name and updated AboutDialog as well as SplashScreen to show information of the EntryAssembly (in our case HeuristicLab-3.3.exe)

Location:

branches/RefactorPluginInfrastructure-2522

Files:

• HeuristicLab.PluginInfrastructure.UI/AboutDialog.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj (modified) (1 diff)
• HeuristicLab.PluginInfrastructure.UI/Main.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/SplashScreen.cs (modified) (2 diffs)
• HeuristicLab/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/AboutDialog.cs

@@ -36 +36 @@
     public AboutDialog() {
       InitializeComponent();
-      var curAssembly = this.GetType().Assembly;
-      productTextBox.Text = GetProduct(curAssembly);
-      versionTextBox.Text = GetVersion();
-      copyrightTextBox.Text = GetCopyright(curAssembly);
+      var entryAssembly = Assembly.GetEntryAssembly();
+      productTextBox.Text = GetProduct(entryAssembly);
+      versionTextBox.Text = entryAssembly.GetFileVersion();
+      copyrightTextBox.Text = GetCopyright(entryAssembly);
       imageList.Images.Add(Resources.Plugin);
       pictureBox.Image = Resources.HeuristicLabLogo;
@@ -77 +77 @@
     }
 
-    private string GetVersion() {
-      return AssemblyExtensions.GetFileVersion(GetType().Assembly);
-    }
-
     private string GetProduct(Assembly asm) {
       AssemblyProductAttribute attribute = GetAttribute<AssemblyProductAttribute>(asm);

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj

@@ -84 +84 @@
       <DependentUpon>LicenseView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Main.cs" />
     <Compile Include="MultiSelectListView.cs">
       <SubType>Component</SubType>

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/SplashScreen.cs

@@ -42 +42 @@
       this.pluginManager = manager;
 
+      var entryAssembly = Assembly.GetEntryAssembly();
       RegisterPluginManagerEventHandlers();
 
-      versionLabel.Text = "Version " + typeof(PluginManager).Assembly.GetFileVersion() + " Windischgarsten (11/2015)";
+      versionLabel.Text = "Version " + entryAssembly.GetFileVersion() + " " 
+        + entryAssembly.GetCustomAttributes().OfType<AssemblyInformationalVersionAttribute>().First().InformationalVersion; // code name
       infoLabel.Text = "";
 
-      var attr = (AssemblyCopyrightAttribute)typeof(PluginManager).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false).Single();
+      var attr = entryAssembly.GetCustomAttributes().OfType<AssemblyCopyrightAttribute>().Single();
       copyrightLabel.Text = "Copyright " + attr.Copyright;
 
@@ -101 +103 @@
       try {
         Invoke((Action<string>)UpdateMessage, msg);
-      }
-      catch (ObjectDisposedException) { }
+      } catch (ObjectDisposedException) { }
     }
 

branches/RefactorPluginInfrastructure-2522/HeuristicLab/3.3/Properties/AssemblyInfo.cs.frame

@@ -29 +29 @@
 [assembly: AssemblyTitle("HeuristicLab 3.3")]
 [assembly: AssemblyDescription("HeuristicLab 3.3")]
+[assembly: AssemblyInformationalVersionAttribute("Windischgarsten (Nov-2015)")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]