From 88f609c6244121f07b45e8101174fdc293bbcb2d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 27 Oct 2019 13:19:32 +0200
Subject: 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.

---
 .../Tango.MachineStudio.Updater/MainWindow.xaml.cs | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs
index 8ac3d7c71..e601b18f2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs
@@ -47,7 +47,7 @@ namespace Tango.MachineStudio.Updater
         private void Update()
         {
             EnsureMachineStudioIsDown();
-            RemoveOldDLLFiles();
+            //RemoveOldDLLFiles();
             ReplaceFiles();
             StartMachineStudio();
             Environment.Exit(0);
@@ -66,22 +66,22 @@ namespace Tango.MachineStudio.Updater
             p.Start();
         }
 
-        private void RemoveOldDLLFiles()
-        {
-            foreach (string dll in Directory.GetFiles(_appPath, "*.dll"))
-            {
-                try
-                {
-                    File.Delete(dll);
-                }
-                catch
-                {
-                    ShowError($"The file '{Path.GetFileName(dll)}' could not be removed. Please close all instances of Machine Studio and press OK.");
-                    RemoveOldDLLFiles();
-                    return;
-                }
-            }
-        }
+        //private void RemoveOldDLLFiles()
+        //{
+        //    foreach (string dll in Directory.GetFiles(_appPath, "*.dll"))
+        //    {
+        //        try
+        //        {
+        //            File.Delete(dll);
+        //        }
+        //        catch
+        //        {
+        //            ShowError($"The file '{Path.GetFileName(dll)}' could not be removed. Please close all instances of Machine Studio and press OK.");
+        //            RemoveOldDLLFiles();
+        //            return;
+        //        }
+        //    }
+        //}
 
         private void ReplaceFiles()
         {
-- 
cgit v1.3.1