Version 1.4.0.0

Author: BornToBeRoot

Source/NETworkManager/Models/Settings/AssemblyInfo.cs

@@ -7,7 +7,7 @@ public class AssemblyInfo
         public string Title { get; set; }
         public string Company { get; set; }
         public string Copyright { get; set; }
-        public string Version { get; set; }
+        public Version Version { get; set; }
 
         public AssemblyInfo()
         {

Source/NETworkManager/Models/Settings/AssemblyManager.cs

@@ -20,7 +20,7 @@ public static void Load()
                 Title = title.Title,
                 Company = company.Company,
                 Copyright = copyright.Copyright,
-                Version = string.Format("{0}.{1}.{2}", name.Version.Major, name.Version.Minor, name.Version.Build)
+                Version = name.Version
             };
         }
     }

Source/NETworkManager/Properties/AssemblyInfo.cs

@@ -49,5 +49,4 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2017.11.21.0")]
-[assembly: AssemblyFileVersion("2017.11.21.0")]
+[assembly: AssemblyVersion("1.4.0.0")]

Source/NETworkManager/ViewModels/Settings/AboutViewModel.cs

@@ -1,6 +1,7 @@
 using NETworkManager.Models.Settings;
 using System.Windows.Input;
 using System.Diagnostics;
+using System.Windows;
 
 namespace NETworkManager.ViewModels.Settings
 {
@@ -21,38 +22,39 @@ public string Title
             }
         }
 
-        private string _copyrightAndAuthor;
-        public string CopyrightAndAuthor
+        private string _version;
+        public string Version
         {
-            get { return _copyrightAndAuthor; }
+            get { return _version; }
             set
             {
-                if (value == _copyrightAndAuthor)
+                if (value == _version)
                     return;
 
-                _copyrightAndAuthor = value;
+                _version = value;
                 OnPropertyChanged();
             }
         }
 
-        private string _version;
-        public string Version
+        private string _copyrightAndAuthor;
+        public string CopyrightAndAuthor
         {
-            get { return _version; }
+            get { return _copyrightAndAuthor; }
             set
             {
-                if (value == _version)
+                if (value == _copyrightAndAuthor)
                     return;
 
-                _version = value;
+                _copyrightAndAuthor = value;
                 OnPropertyChanged();
             }
-        }
+        }               
         #endregion
 
         #region Constructor
         public AboutViewModel()
-        {           
+        {
+            Version = string.Format("{0} {1}", Application.Current.Resources["String_Version"] as string, AssemblyManager.Current.Version);
             CopyrightAndAuthor = string.Format("{0} {1}.", AssemblyManager.Current.Copyright, AssemblyManager.Current.Company);
         }
         #endregion

Source/NETworkManager/Views/Settings/AboutView.xaml

@@ -21,10 +21,7 @@
             <StackPanel Grid.Column="1" Margin="20,0,0,0">
                 <TextBlock FontSize="32" Grid.Row="0" Text="{DynamicResource String_ProductName}" Style="{StaticResource HeaderTextBlock}" />
                 <TextBlock Text="{DynamicResource String_Slogan}" Style="{DynamicResource WrapTextBlock}" Margin="0,0,0,5" />
-                <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
-                    <TextBlock Text="{DynamicResource String_Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" />
-                    <TextBlock Text="{Binding Source={x:Static Settings:AssemblyManager.Current}, Path=Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" Margin="5,0,0,0"/>
-                </StackPanel>
+                <TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" Margin="0,0,0,5" />
                 <TextBlock Text="{Binding CopyrightAndAuthor}" Style="{StaticResource DefaultTextBlock}" Margin="0,0,0,5"/>
                 <TextBlock Text="{x:Static Resources:Resources.License_GNUGPLv3 }" Style="{StaticResource LinkTextBlock}">
                     <TextBlock.InputBindings>