Removed rollback version in machine studio.

Omitted remove old dll files from machine studio updater.
Removed ColorCapture module from MS update to reduce package size.
Added ColorCapture module only to MS installer.
Added ExternalBridge default timeout to machine studio settings file.

2 files changed, 33 insertions, 32 deletions

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 b22d65192..90fe25c8f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -459,6 +459,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                         if (x.SelectedMachine is ExternalBridgeTcpClient)
                         {
                             x.SelectedMachine.As<ExternalBridgeTcpClient>().EnableApplicationLogs = x.EnableApplicationLogs;
+                            x.SelectedMachine.RequestTimeout = _settings.ExternalBridgeRequestTimeout;
                         }
 
                         if (x.SelectedMachine.RequiresAuthentication)
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..2ee8574b1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -173,7 +173,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             DownloadLatestVersionResponse response = await _machineStudioWebClient.DownloadLatestVersion(new DownloadLatestVersionRequest()
             {
-                
+
             });
 
             _updateInfo = new CheckForUpdatesResponse();
@@ -272,7 +272,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     using (StorageBlobDownloader downloader = new StorageBlobDownloader(_updateInfo.BlobAddress, tempFile.Path))
                     {
-                        downloader.Progress += (x, e) => 
+                        downloader.Progress += (x, e) =>
                         {
                             InvokeUINow(() =>
                             {
@@ -326,40 +326,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 +385,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();