aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-10-27 13:19:32 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-10-27 13:19:32 +0200
commit88f609c6244121f07b45e8101174fdc293bbcb2d (patch)
tree330aaad66b1a34ccfb2a29cacfe3fc8c4f01500b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater
parent312e8ccad554d6d0e7d21444e069731e770db978 (diff)
downloadTango-88f609c6244121f07b45e8101174fdc293bbcb2d.tar.gz
Tango-88f609c6244121f07b45e8101174fdc293bbcb2d.zip
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.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs34
1 files changed, 17 insertions, 17 deletions
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()
{