Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 34 insertions, 33 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 4a94322fb..160041b5f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -173,12 +173,13 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             DownloadLatestVersionResponse response = await _machineStudioWebClient.DownloadLatestVersion(new DownloadLatestVersionRequest()
             {
-                
+
             });
 
             _updateInfo = new CheckForUpdatesResponse();
             _updateInfo.BlobAddress = response.BlobAddress;
             _updateInfo.Version = response.Version;
+            _updateInfo.CdnAddress = response.CdnAddress;
             LatestVersion = _updateInfo.Version;
 
             StartUpdate();
@@ -270,9 +271,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     logManager.Log("Creating temporary file " + tempFile);
 
-                    using (StorageBlobDownloader downloader = new StorageBlobDownloader(_updateInfo.BlobAddress, tempFile.Path))
+                    using (AutoFileDownloader downloader = new AutoFileDownloader(_updateInfo.BlobAddress, _updateInfo.CdnAddress, tempFile.Path))
                     {
-                        downloader.Progress += (x, e) => 
+                        downloader.Progress += (x, e) =>
                         {
                             InvokeUINow(() =>
                             {
@@ -326,40 +327,40 @@ namespace Tango.MachineStudio.UI.ViewModels
                         }
                     }
 
-                    try
-                    {
-                        LogManager.Log("Backing up current version...");
-                        CurrentUpdateFile = "Backing up current version...";
+                    //try
+                    //{
+                    //    LogManager.Log("Backing up current version...");
+                    //    CurrentUpdateFile = "Backing up current version...";
 
-                        String rollbackFolder = GetRollbackFolder();
-                        Directory.CreateDirectory(rollbackFolder);
+                    //    String rollbackFolder = GetRollbackFolder();
+                    //    Directory.CreateDirectory(rollbackFolder);
 
-                        String backFile = GetRollbackFile();
+                    //    String backFile = GetRollbackFile();
 
-                        if (File.Exists(backFile))
-                        {
-                            File.Delete(backFile);
-                        }
+                    //    if (File.Exists(backFile))
+                    //    {
+                    //        File.Delete(backFile);
+                    //    }
 
-                        using (ZipFile backZip = new ZipFile(backFile))
-                        {
-                            int currentEntry = 0;
+                    //    using (ZipFile backZip = new ZipFile(backFile))
+                    //    {
+                    //        int currentEntry = 0;
 
-                            backZip.SaveProgress += (_, e) =>
-                            {
-                                UpdateProgress = ((double)(currentEntry++) / (double)backZip.Entries.Count) * 100d;
-                            };
+                    //        backZip.SaveProgress += (_, e) =>
+                    //        {
+                    //            UpdateProgress = ((double)(currentEntry++) / (double)backZip.Entries.Count) * 100d;
+                    //        };
 
-                            backZip.Password = "Aa123456";
-                            backZip.AddDirectory(_appPath);
-                            backZip.Save();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogManager.Log(ex, "Could not construct rollback.");
-                        _notification.ShowWarning("Update center has failed to construct a rollback point for the current version. Version rollback will not be available.");
-                    }
+                    //        backZip.Password = "Aa123456";
+                    //        backZip.AddDirectory(_appPath);
+                    //        backZip.Save();
+                    //    }
+                    //}
+                    //catch (Exception ex)
+                    //{
+                    //    LogManager.Log(ex, "Could not construct rollback.");
+                    //    _notification.ShowWarning("Update center has failed to construct a rollback point for the current version. Version rollback will not be available.");
+                    //}
 
                     TangoIOC.Default.GetInstance<MainViewVM>().DisableCheckForUpdates = true;
                     Status = UpdateStatus.UpdateCompleted;
@@ -385,8 +386,8 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             try
             {
-                LogManager.Log("Clearing EF model store...");
-                ObservablesContext.ClearModelStore();
+                //LogManager.Log("Clearing EF model store...");
+                //ObservablesContext.ClearModelStore();
 
                 Process p = new Process();