From 2436ece5b22ee656bb0ec66c23fa890972bf912b Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Fri, 15 Jan 2021 04:26:02 +0200
Subject: Machine_Studio_v4.3.2

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

(limited to 'Software/Visual_Studio')

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 1058e20f4..051aa1e37 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:{D95AFB48-DABA-4581-BC2B-E5E3FA463019} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{ADD48F44-74A7-4FB8-91D8-8F6ACBCE34FB} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.3.1.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.3.2.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="-"/>
@@ -836,7 +836,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.3.1" 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.3.1"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.3.2" 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.3.2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
index eeafa513f..d55324b32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
@@ -281,8 +281,8 @@ namespace Tango.MachineStudio.Common.Publish
 
                             OnPublishProgress(0, 100, "Checking outgoing commits...");
                             int commits = git.GetOutgoingCommits().Count;
-                            if (commits > 0)
-                            {
+                            //if (commits > 0)
+                            //{
                                 if (Options.AutoCommitAndPush)
                                 {
                                     OnPublishProgress(0, 100, "Pushing repository changes...");
@@ -292,7 +292,7 @@ namespace Tango.MachineStudio.Common.Publish
                                 {
                                     throw new InvalidOperationException($"There are {commits} outgoing commits on the repository. Please push all commits before creating the Tag");
                                 }
-                            }
+                            //}
 
                             git.Progress += (x, e) =>
                             {
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 743e53976..68bc336b0 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.3.1.0")]
+[assembly: AssemblyVersion("4.3.2.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
-- 
cgit v1.3.1