Version 1.7.0.0

BornToBeRoot · BornToBeRoot · commit 552a43dddb6c · 2018-08-11T23:31:28.000+02:00
diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -268,10 +268,6 @@ public MainWindow()
             if (ConfigurationManager.Current.IsAdmin)
                 Title = $"[{NETworkManager.Resources.Localization.Strings.Administrator}] {Title}";
 
-#if DEBUG
-            Title += $" - Debug ({AssemblyManager.Current.Version} | {AssemblyManager.Current.BuildDate.ToString(CultureInfo.CurrentCulture)})";
-#endif
-
             // Load Profiles
             ProfileManager.Load();
 
diff --git a/Source/NETworkManager/Models/Settings/AssemblyInfo.cs b/Source/NETworkManager/Models/Settings/AssemblyInfo.cs
@@ -6,7 +6,6 @@ public class AssemblyInfo
     {
         public string Title { get; set; }
         public Version Version { get; set; }
-        public DateTime BuildDate { get; set; }
 
         public AssemblyInfo()
         {
diff --git a/Source/NETworkManager/Models/Settings/AssemblyManager.cs b/Source/NETworkManager/Models/Settings/AssemblyManager.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System;
 
 namespace NETworkManager.Models.Settings
 {
@@ -14,11 +13,10 @@ public static void Load()
             var title = assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0] as AssemblyTitleAttribute;
             var name = assembly.GetName();
 
-            Current = new AssemblyInfo()
+            Current = new AssemblyInfo
             {
                 Title = title?.Title,
-                Version = name.Version,
-                BuildDate = new DateTime(2000, 1, 1).Add(new TimeSpan((TimeSpan.TicksPerDay * name.Version.Build) + (TimeSpan.TicksPerSecond * 2 * name.Version.Revision)))                
+                Version = name.Version
             };
         }
     }
diff --git a/Source/NETworkManager/Properties/AssemblyInfo.cs b/Source/NETworkManager/Properties/AssemblyInfo.cs
@@ -49,4 +49,6 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.*")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
+
diff --git a/Source/NETworkManager/ViewModels/AboutViewModel.cs b/Source/NETworkManager/ViewModels/AboutViewModel.cs
@@ -4,19 +4,17 @@
 using NETworkManager.Models.Update;
 using System;
 using System.ComponentModel;
-using System.Globalization;
 using NETworkManager.Models.Documentation;
 using System.Windows.Data;
+using NETworkManager.Resources.Localization;
 using NETworkManager.Utilities;
 
 namespace NETworkManager.ViewModels
 {
     public class AboutViewModel : ViewModelBase
     {
         #region Variables
-        public string Version => AssemblyManager.Current.Version.ToString();
-
-        public string BuildDate => AssemblyManager.Current.BuildDate.ToString(CultureInfo.CurrentCulture);
+        public string Version => $"{Strings.Version} {AssemblyManager.Current.Version}";
 
         private bool _isUpdateCheckRunning;
         public bool IsUpdateCheckRunning
diff --git a/Source/NETworkManager/Views/AboutView.xaml b/Source/NETworkManager/Views/AboutView.xaml
@@ -38,10 +38,7 @@
                 <StackPanel Grid.Column="1" Margin="20,0,0,0">
                     <TextBlock FontSize="32" Text="{x:Static localization:StaticStrings.ProductName}" Style="{StaticResource HeaderTextBlock}" />
                     <TextBlock Text="{x:Static localization:Strings.Slogan}" Style="{DynamicResource WrapTextBlock}" Margin="0,0,0,5" />
-                    <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
-                        <TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" />
-                        <TextBlock Text="{Binding BuildDate, StringFormat={}({0})}" Style="{StaticResource DefaultTextBlock}" Margin="10,0,0,0" />
-                    </StackPanel>
+                    <TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" Margin="0,0,0,5" />
                     <TextBlock Text="{x:Static resources:Resources.NETworkManager_License}" Style="{StaticResource LinkTextBlock}" Margin="0,0,0,5">
                         <TextBlock.InputBindings>
                             <MouseBinding Command="{Binding OpenWebsiteCommand}" CommandParameter="{x:Static resources:Resources.NETworkManager_LicenseUrl}" MouseAction="LeftClick" />

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ public class AssemblyInfo`
`6`	`6`	`{`
`7`	`7`	`public string Title { get; set; }`
`8`	`8`	`public Version Version { get; set; }`
`9`		`- public DateTime BuildDate { get; set; }`
`10`	`9`
`11`	`10`	`public AssemblyInfo()`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using System;`
`3`	`2`
`4`	`3`	`namespace NETworkManager.Models.Settings`
`5`	`4`	`{`
`@@ -14,11 +13,10 @@ public static void Load()`
`14`	`13`	`var title = assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0] as AssemblyTitleAttribute;`
`15`	`14`	`var name = assembly.GetName();`
`16`	`15`
`17`		`- Current = new AssemblyInfo()`
	`16`	`+ Current = new AssemblyInfo`
`18`	`17`	`{`
`19`	`18`	`Title = title?.Title,`
`20`		`- Version = name.Version,`
`21`		`- BuildDate = new DateTime(2000, 1, 1).Add(new TimeSpan((TimeSpan.TicksPerDay * name.Version.Build) + (TimeSpan.TicksPerSecond * 2 * name.Version.Revision)))`
	`19`	`+ Version = name.Version`
`22`	`20`	`};`
`23`	`21`	`}`
`24`	`22`	`}`