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.ColorCapture.csproj        |  4 +-
 .../MachineStudioSettings.cs                       |  6 ++
 .../Properties/AssemblyInfo.cs                     |  2 +-
 .../Tango.MachineStudio.UI.csproj                  | 10 +--
 .../ViewModels/MainViewVM.cs                       |  1 +
 .../ViewModels/UpdateViewVM.cs                     | 76 +++++++++++-----------
 .../Tango.MachineStudio.UI/Views/UpdateView.xaml   |  8 +--
 .../Tango.MachineStudio.Updater/MainWindow.xaml.cs | 34 +++++-----
 8 files changed, 70 insertions(+), 71 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
index 8f37a9c2d..4e6feceb5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 781e034e8..c307a8e33 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -129,6 +129,11 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public TimeSpan MaximumCacheTime { get; set; }
 
+        /// <summary>
+        /// Gets or sets the external bridge request timeout.
+        /// </summary>
+        public TimeSpan ExternalBridgeRequestTimeout { get; set; }
+
         /// <summary>
         /// Gets the machine service address.
         /// </summary>
@@ -167,6 +172,7 @@ namespace Tango.MachineStudio.Common
             CachingMode = ObservablesContextInMemoryCachingMode.None;
             Theme = MachineStudioTheme.Light;
             JobUnitsMethod = JobUnitsMethods.Operator;
+            ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 91792e0f3..c268cb607 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.0.29.0")]
+[assembly: AssemblyVersion("4.0.30.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index e172bbc91..b542821d7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -440,10 +440,6 @@
       <Project>{5001990f-977b-48ff-b217-0236a5022ad8}</Project>
       <Name>Tango.Web</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\TCC\Tango.TCC.BL\Tango.TCC.BL.csproj">
-      <Project>{f209fae8-73f9-441b-97f4-0844a0279390}</Project>
-      <Name>Tango.TCC.BL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Modules\MachineStudio.Dispensers\Tango.MachineStudio.Dispensers.csproj">
       <Project>{f69da3a8-f823-461e-87cf-a9275abc0b15}</Project>
       <Name>Tango.MachineStudio.Dispensers</Name>
@@ -452,10 +448,6 @@
       <Project>{7d0fce3c-9a37-439c-9f9f-b26cfd6a8a33}</Project>
       <Name>Tango.MachineStudio.Catalogs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Modules\Tango.MachineStudio.ColorCapture\Tango.MachineStudio.ColorCapture.csproj">
-      <Project>{1b87ca53-50bd-4c48-a8c7-fbb9f1419aff}</Project>
-      <Name>Tango.MachineStudio.ColorCapture</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.ColorLab\Tango.MachineStudio.ColorLab.csproj">
       <Project>{4d183aca-552b-4135-ae81-7c5a8e5fc3b1}</Project>
       <Name>Tango.MachineStudio.ColorLab</Name>
@@ -649,7 +641,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\"</PostB
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
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...";
-
-                        String rollbackFolder = GetRollbackFolder();
-                        Directory.CreateDirectory(rollbackFolder);
-
-                        String backFile = GetRollbackFile();
-
-                        if (File.Exists(backFile))
-                        {
-                            File.Delete(backFile);
-                        }
-
-                        using (ZipFile backZip = new ZipFile(backFile))
-                        {
-                            int currentEntry = 0;
-
-                            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.");
-                    }
+                    //try
+                    //{
+                    //    LogManager.Log("Backing up current version...");
+                    //    CurrentUpdateFile = "Backing up current version...";
+
+                    //    String rollbackFolder = GetRollbackFolder();
+                    //    Directory.CreateDirectory(rollbackFolder);
+
+                    //    String backFile = GetRollbackFile();
+
+                    //    if (File.Exists(backFile))
+                    //    {
+                    //        File.Delete(backFile);
+                    //    }
+
+                    //    using (ZipFile backZip = new ZipFile(backFile))
+                    //    {
+                    //        int currentEntry = 0;
+
+                    //        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.");
+                    //}
 
                     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();
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
index a35928e12..924db7f8b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -109,12 +109,12 @@
                                                                 </StackPanel>
                                                             </Button>
 
-                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
+                                                            <!--<Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <materialDesign:PackIcon Kind="BackupRestore" Width="24" Height="24" />
                                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Restore previous version</TextBlock>
                                                                 </StackPanel>
-                                                            </Button>
+                                                            </Button>-->
                                                         </StackPanel>
                                                     </Grid>
                                                 </Setter.Value>
@@ -185,12 +185,12 @@
                                                                 <TextBlock VerticalAlignment="Center" Margin="0 20 0 0">Your version of Machine Studio is up to date!</TextBlock>
                                                             </StackPanel>
 
-                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
+                                                            <!--<Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <materialDesign:PackIcon Kind="BackupRestore" Width="24" Height="24" />
                                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Restore previous version</TextBlock>
                                                                 </StackPanel>
-                                                            </Button>
+                                                            </Button>-->
                                                         </StackPanel>
                                                     </Grid>
                                                 </Setter.Value>
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