merge

1 files changed, 13 insertions, 12 deletions

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 63cff2242..c40f91005 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -19,12 +19,13 @@ using Tango.MachineStudio.Common.Authentication;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
-using Tango.MachineStudio.Common.Update;
+using Tango.MachineStudio.Common.Web;
 using Tango.SharedUI;
 using Tango.MachineStudio.UI.Messages;
 using Tango.Settings;
 using Tango.MachineStudio.Common;
 using Tango.Transport.Web;
+using Tango.BL;
 
 namespace Tango.MachineStudio.UI.ViewModels
 {
@@ -55,6 +56,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         private CheckForUpdatesResponse _updateInfo;
         private TemporaryFolder _newPackageTempFolder;
         private TemporaryFolder _previousPackageTempFolder;
+        private MachineStudioWebClient _machineStudioWebClient;
 
         private bool _forcedUpdate;
         public bool ForcedUpdate
@@ -139,8 +141,9 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public RelayCommand TryRollbackAgainCommand { get; set; }
 
-        public UpdateViewVM(INotificationProvider notification, IAuthenticationProvider authentication, INavigationManager navigation, IStudioApplicationManager application)
+        public UpdateViewVM(MachineStudioWebClient machineStudioWebClient, INotificationProvider notification, IAuthenticationProvider authentication, INavigationManager navigation, IStudioApplicationManager application)
         {
+            _machineStudioWebClient = machineStudioWebClient;
             _notification = notification;
             _navigation = navigation;
             _application = application;
@@ -168,11 +171,9 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             Status = UpdateStatus.CheckingForUpdate;
 
-            var client = new MachineStudioUpdateService();
-
-            DownloadLatestVersionResponse response = await client.DownloadLatestVersion(new DownloadLatestVersionRequest()
+            DownloadLatestVersionResponse response = await _machineStudioWebClient.DownloadLatestVersion(new DownloadLatestVersionRequest()
             {
-                AccessToken = _authentication.AccessToken,
+                
             });
 
             _updateInfo = new CheckForUpdatesResponse();
@@ -209,17 +210,14 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
-            Task.Factory.StartNew(() =>
+            Task.Factory.StartNew((Action)(() =>
             {
                 try
                 {
                     Thread.Sleep(2000);
 
-                    var client = new MachineStudioUpdateService();
-
-                    CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
+                    CheckForUpdatesResponse response = _machineStudioWebClient.CheckForUpdates(new CheckForUpdatesRequest()
                     {
-                        AccessToken = _authentication.AccessToken,
                         Version = _application.Version.ToString(),
                     }).Result;
 
@@ -240,7 +238,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     logManager.Log(ex, "Error while checking for version update!");
                     Status = UpdateStatus.Error;
                 }
-            });
+            }));
         }
 
         private void BackToApplication()
@@ -387,6 +385,9 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             try
             {
+                LogManager.Log("Clearing EF model store...");
+                ObservablesContext.ClearModelStore();
+
                 Process p = new Process();
 
                 if (Status == UpdateStatus.UpdateCompleted)