From 3499090dce4acc5b5d4bbb02f07f138950790b25 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
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.

---
 .../Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs     |  2 +-
 .../Tango.MachineStudio.UI/ViewModels/MainViewVM.cs        |  3 +--
 .../Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs      | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')

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;
         /// <summary>
         /// 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;
+        /// <summary>
+        /// Gets or sets the latest version comments.
+        /// </summary>
+        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
                     {
-- 
cgit v1.3.1