From 3499090dce4acc5b5d4bbb02f07f138950790b25 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 2 Aug 2018 10:44:57 +0300 Subject: Implemented new version display in machine studio. Added release notes to machine studio update center. --- .../Properties/AssemblyInfo.cs | 2 +- .../DefaultStudioApplicationManager.cs | 8 +++---- .../TFS/TeamFoundationServiceExtendedClient.cs | 6 ++--- .../ViewModels/LoadingViewVM.cs | 2 +- .../ViewModels/MainViewVM.cs | 3 +-- .../ViewModels/UpdateViewVM.cs | 14 ++++++++++- .../Tango.MachineStudio.UI/Views/AboutView.xaml | 8 ++++++- .../Tango.MachineStudio.UI/Views/LoadingView.xaml | 8 ++++++- .../Tango.MachineStudio.UI/Views/MainView.xaml | 3 ++- .../Tango.MachineStudio.UI/Views/UpdateView.xaml | 27 ++++++++++++++++++++-- 10 files changed, 64 insertions(+), 17 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 5c08c868b..69528c8db 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("2.1.14.18213")] +[assembly: AssemblyVersion("2.0.14.18213")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index c7ac60ace..ee9337eb3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -131,11 +131,11 @@ namespace Tango.MachineStudio.UI.StudioApplication /// /// Gets the machine studio application version. /// - public string Version + public Version Version { get { - return AssemblyHelper.GetCurrentAssemblyVersion().ToString(4); + return AssemblyHelper.GetCurrentAssemblyVersion(); } } @@ -276,11 +276,11 @@ namespace Tango.MachineStudio.UI.StudioApplication /// /// Gets the core libraries version. /// - public string CoreVersion + public Version CoreVersion { get { - return typeof(ExtendedObject).Assembly.GetName().Version.ToString(3); + return typeof(ExtendedObject).Assembly.GetName().Version; } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs index d81a78a93..dbae25e70 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -74,7 +74,7 @@ namespace Tango.MachineStudio.UI.TFS IStudioApplicationManager app = TangoIOC.Default.GetInstance(); var items = await GetWorkItemsCreatedBy(Project, GetUserTeamMember()); items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("
", "").Replace("
", "")); - ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < Version.Parse(app.Version)).ToObservableCollection(); + ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < app.Version).ToObservableCollection(); } } catch (Exception ex) @@ -134,7 +134,7 @@ namespace Tango.MachineStudio.UI.TFS item.ChangedBy = currentUser; item.AuthorizedAs = currentUser; - item.FoundInBuild = app.Version; + item.FoundInBuild = app.Version.ToString(); item.Priority = Priority.Priority3; item.Severity = Severity.Medium; item.State = State.New; @@ -189,7 +189,7 @@ namespace Tango.MachineStudio.UI.TFS } SystemInformationModel sysModel = new SystemInformationModel(); - sysModel.ApplicationVersion = app.Version; + sysModel.ApplicationVersion = app.Version.ToString(); sysModel.EmbeddedVersion = "N/A"; sysModel.HostName = Environment.MachineName; sysModel.UserName = auth.CurrentUser.Contact.FullName; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs index a7750b39c..a468dc2e7 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs @@ -98,7 +98,7 @@ namespace Tango.MachineStudio.UI.ViewModels { Email = "ForceUpdate", Password = "ForceUpdate", - Version = ApplicationManager.Version, + Version = ApplicationManager.Version.ToString(), }); if (response.IsUpdateAvailable && response.ForcedUpdate) diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index df1ea5f7e..f8320e1f2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -235,7 +235,6 @@ namespace Tango.MachineStudio.UI.ViewModels set { _latestVersion = value; RaisePropertyChangedAuto(); } } - private bool _disableCheckForUpdates; /// /// Gets or sets a value indicating whether [disable check for updates]. @@ -359,7 +358,7 @@ namespace Tango.MachineStudio.UI.ViewModels { Email = _authenticationProvider.CurrentUser.Email, Password = _authenticationProvider.CurrentUser.Password, - Version = _applicationManager.Version, + Version = _applicationManager.Version.ToString(), }); IsUpdateAvailable = response.IsUpdateAvailable; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs index d7ce29b2e..f2550c598 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -70,6 +70,16 @@ namespace Tango.MachineStudio.UI.ViewModels set { _latestVersion = value; RaisePropertyChangedAuto(); } } + private String _updateComments; + /// + /// Gets or sets the latest version comments. + /// + public String UpdateComments + { + get { return _updateComments; } + set { _updateComments = value; RaisePropertyChangedAuto(); } + } + private double _downloadProgress; public double DownloadProgress @@ -127,6 +137,7 @@ namespace Tango.MachineStudio.UI.ViewModels _updateInfo = msg.UpdateResponse; Status = UpdateStatus.UpdateAvailable; LatestVersion = _updateInfo.Version; + UpdateComments = _updateInfo.Comments; StartUpdate(); } @@ -157,7 +168,7 @@ namespace Tango.MachineStudio.UI.ViewModels { Email = _authentication.CurrentUser.Email, Password = _authentication.CurrentUser.Password, - Version = _application.Version, + Version = _application.Version.ToString(), }); if (response.IsUpdateAvailable) @@ -165,6 +176,7 @@ namespace Tango.MachineStudio.UI.ViewModels _updateInfo = response; Status = UpdateStatus.UpdateAvailable; LatestVersion = response.Version; + UpdateComments = response.Comments; } else { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml index 0f8bceac7..55c4edc91 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml @@ -5,9 +5,15 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" + xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" - d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}"> + d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}"> + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml index 2a63ae00f..c6b9cf881 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml @@ -4,9 +4,15 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" d:DesignHeight="720" d:DesignWidth="1280" Cursor="Wait" DataContext="{Binding LoadingViewVM, Source={StaticResource Locator}}" Background="Transparent"> + + + + + @@ -23,7 +29,7 @@ v - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml index e36a03ffe..7044ad32e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml @@ -25,6 +25,7 @@ + @@ -309,7 +310,7 @@ Version - + is available ! diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml index a5c31af3d..52ba9ee18 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml @@ -5,10 +5,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels" + xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views" mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" DataContext="{Binding UpdateViewVM, Source={StaticResource Locator}}" FontSize="20"> + + + + + - Update Center + Update Center @@ -34,6 +40,23 @@ + + + + + + + Release Notes + + + @@ -70,7 +93,7 @@ Version - + is available! -- cgit v1.3.1