From 1afce4f7c5dd3b9397a2b36d6ddffb9242f37924 Mon Sep 17 00:00:00 2001 From: Michael Krisper <michael.krisper@tugraz.at> Date: Thu, 2 Sep 2021 11:22:36 +0200 Subject: [PATCH] Added Version Number in Window-Title and added "For Testing and Feedback" --- VECTO3GUI2020/MainWindow.xaml | 2 +- VECTO3GUI2020/Properties/AssemblyInfo.cs | 2 +- VECTO3GUI2020/Properties/Version.cs | 4 ++-- VECTO3GUI2020/Properties/Version.tt | 4 ++-- VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs | 4 ++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/VECTO3GUI2020/MainWindow.xaml b/VECTO3GUI2020/MainWindow.xaml index 452f847cdd..cf03eac8e3 100644 --- a/VECTO3GUI2020/MainWindow.xaml +++ b/VECTO3GUI2020/MainWindow.xaml @@ -9,7 +9,7 @@ xmlns:system="clr-namespace:System;assembly=mscorlib" d:DataContext="{d:DesignInstance Type=Implementation:MainWindowViewModel}" x:Class="VECTO3GUI2020.MainWindow" mc:Ignorable="d" - Title="Vecto" Height="450" Width="820" + Title="{Binding Version}" Height="450" Width="820" MinWidth="800" MinHeight="420" diff --git a/VECTO3GUI2020/Properties/AssemblyInfo.cs b/VECTO3GUI2020/Properties/AssemblyInfo.cs index 048eb62a0b..faea5cd03a 100644 --- a/VECTO3GUI2020/Properties/AssemblyInfo.cs +++ b/VECTO3GUI2020/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("VECTO3GUI2020")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: InternalsVisibleTo("Vecto3GUI2020Test")] diff --git a/VECTO3GUI2020/Properties/Version.cs b/VECTO3GUI2020/Properties/Version.cs index 5ade37d679..9cd97f5647 100644 --- a/VECTO3GUI2020/Properties/Version.cs +++ b/VECTO3GUI2020/Properties/Version.cs @@ -30,5 +30,5 @@ */ using System.Reflection; -[assembly: AssemblyVersion("0.1.0.1954")] -[assembly: AssemblyFileVersion("0.1.0.1954")] +[assembly: AssemblyVersion("0.2.0.2436")] +[assembly: AssemblyFileVersion("0.2.0.2436")] diff --git a/VECTO3GUI2020/Properties/Version.tt b/VECTO3GUI2020/Properties/Version.tt index bf6606a743..1808397053 100644 --- a/VECTO3GUI2020/Properties/Version.tt +++ b/VECTO3GUI2020/Properties/Version.tt @@ -33,8 +33,8 @@ <#@ output extension=".cs"#> <#@ include file="../../VectoCore/VectoCore/VersionNumber.t4" once="true" #> using System.Reflection; -[assembly: AssemblyVersion("0.1.0.<#= GetBuildNumber() #>")] -[assembly: AssemblyFileVersion("0.1.0.<#= GetBuildNumber() #>")] +[assembly: AssemblyVersion("0.2.0.<#= GetBuildNumber() #>")] +[assembly: AssemblyFileVersion("0.2.0.<#= GetBuildNumber() #>")] <#+ int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2017, 1, 1)).TotalDays; #> \ No newline at end of file diff --git a/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs index 4d7a411dbd..a9ba9f4948 100644 --- a/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs +++ b/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs @@ -5,6 +5,7 @@ using Ninject; using System.Diagnostics; using System.Windows.Input; using Castle.DynamicProxy.Generators.Emitters.SimpleAST; +using System.Reflection; using VECTO3GUI2020.Helper; using VECTO3GUI2020.ViewModel.Implementation.Common; using VECTO3GUI2020.Util; @@ -96,6 +97,9 @@ namespace VECTO3GUI2020.ViewModel.Implementation get => _jobListVm; set => SetProperty(ref _jobListVm, value); } + + public string Version => "VECTO Multistage " + Assembly.GetExecutingAssembly().GetName().Version + " (For Testing and Feedback)"; + #endregion #region Commands -- GitLab