From 591fb3cbef11e81cbf734df5a92826ac5dbd7af8 Mon Sep 17 00:00:00 2001
From: Roy <Roy.mail.net@gmail.com>
Date: Tue, 14 Feb 2023 13:32:54 +0200
Subject: Fixed MS to PPC connection.

---
 .../ViewModels/MachineConnectionViewVM.cs                     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 165841905..c7c8335f0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -38,7 +38,16 @@ namespace Tango.MachineStudio.UI.ViewModels
         public IExternalBridgeClient SelectedMachine
         {
             get { return _selectedMachine; }
-            set { _selectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(RequiresAuthentication)); InvalidateRelayCommands(); }
+            set
+            {
+                if (value != null)
+                {
+                    _selectedMachine = value;
+                    RaisePropertyChangedAuto();
+                    RaisePropertyChanged(nameof(RequiresAuthentication));
+                    InvalidateRelayCommands();
+                }
+            }
         }
 
         /// <summary>
-- 
cgit v1.3.1


From 846503d5df0203f846f36ad6ad0da8dba596bb0c Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy.mail.net@gmail.com>
Date: Tue, 14 Feb 2023 13:38:30 +0200
Subject: Machine_Studio_v4.9.6

---
 .../Advanced Installer Projects/Machine Studio Installer.aip        | 6 +++---
 .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index 19b3b39d3..d78e37f68 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip	
@@ -16,10 +16,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{FD1BB362-311C-4C2B-8B3A-1F87B0DF074F} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{8B3B7897-753D-4BD6-9BB3-E582EB6F1823} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.9.5.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.9.6.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -845,7 +845,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.9.5" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.9.5"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.9.6" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.9.6"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
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 110772b2d..c87abde49 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.9.5.0")]
+[assembly: AssemblyVersion("4.9.6.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
-- 
cgit v1.3.1