Machine_Studio_v4.2.4

6 files changed, 65 insertions, 93 deletions

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 b32cfee44..99bd9a17a 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:{A7D1ABE5-6524-4FE9-A6F9-0CF85F760172} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{9F21D2D0-E956-4121-8D2F-664EAA7105C1} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.2.3.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.2.4.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="-"/>
@@ -44,21 +44,7 @@
     <ROW Directory="SQLExaminer_Dir" Directory_Parent="APPDIR" DefaultDir="SQLEXA~1|SQLExaminer" DirectoryOptions="3"/>
     <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
     <ROW Directory="TCC_Dir" Directory_Parent="APPDIR" DefaultDir="TCC" DirectoryOptions="3"/>
-    <ROW Directory="alpine.3.9x64_Dir" Directory_Parent="lib_Dir" DefaultDir="ALPINE~1.9-X|alpine.3.9-x64" DirectoryOptions="3"/>
-    <ROW Directory="alpinex64_Dir" Directory_Parent="lib_Dir" DefaultDir="ALPINE~1|alpine-x64" DirectoryOptions="3"/>
-    <ROW Directory="debian.9x64_Dir" Directory_Parent="lib_Dir" DefaultDir="DEBIAN~1.9-X|debian.9-x64" DirectoryOptions="3"/>
-    <ROW Directory="debianarm64_Dir" Directory_Parent="lib_Dir" DefaultDir="DEBIAN~1|debian-arm64" DirectoryOptions="3"/>
-    <ROW Directory="fedorax64_Dir" Directory_Parent="lib_Dir" DefaultDir="FEDORA~1|fedora-x64" DirectoryOptions="3"/>
-    <ROW Directory="lib_Dir" Directory_Parent="APPDIR" DefaultDir="lib" DirectoryOptions="3"/>
-    <ROW Directory="linuxx64_Dir" Directory_Parent="lib_Dir" DefaultDir="LINUX-~1|linux-x64" DirectoryOptions="3"/>
-    <ROW Directory="osx_Dir" Directory_Parent="lib_Dir" DefaultDir="osx" DirectoryOptions="3"/>
-    <ROW Directory="rhelx64_Dir" Directory_Parent="lib_Dir" DefaultDir="rhel-x64" DirectoryOptions="3"/>
-    <ROW Directory="ubuntu.16.04arm64_Dir" Directory_Parent="lib_Dir" DefaultDir="UBUNTU~1.04-|ubuntu.16.04-arm64" DirectoryOptions="3"/>
-    <ROW Directory="ubuntu.18.04x64_Dir" Directory_Parent="lib_Dir" DefaultDir="UBUNTU~2.04-|ubuntu.18.04-x64" DirectoryOptions="3"/>
-    <ROW Directory="win32_Dir" Directory_Parent="lib_Dir" DefaultDir="win32" DirectoryOptions="3"/>
-    <ROW Directory="x64_1_Dir" Directory_Parent="win32_Dir" DefaultDir="x64" DirectoryOptions="3"/>
     <ROW Directory="x64_Dir" Directory_Parent="APPDIR" DefaultDir="x64" DirectoryOptions="3"/>
-    <ROW Directory="x86_1_Dir" Directory_Parent="win32_Dir" DefaultDir="x86" DirectoryOptions="3"/>
     <ROW Directory="x86_Dir" Directory_Parent="APPDIR" DefaultDir="x86" DirectoryOptions="3"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
@@ -347,20 +333,8 @@
     <ROW Component="concrt140.dll" ComponentId="{BA1FDE96-3FAB-4FE6-BCDF-547FB5468791}" Directory_="APPDIR" Attributes="256" KeyPath="concrt140.dll"/>
     <ROW Component="cvextern.dll" ComponentId="{5FBA3BA5-D6C4-48B0-B108-61E7F9915D5A}" Directory_="APPDIR" Attributes="256" KeyPath="cvextern.dll"/>
     <ROW Component="fpgen.exe" ComponentId="{457206AA-0093-4C01-80E4-BBCAB192F18F}" Directory_="APPDIR" Attributes="0" KeyPath="fpgen.exe"/>
-    <ROW Component="git2106a5f2.dll" ComponentId="{16263A91-E9CF-4A2E-BD95-E9A7D805B098}" Directory_="x64_1_Dir" Attributes="256" KeyPath="git2106a5f2.dll"/>
-    <ROW Component="git2106a5f2.dll_1" ComponentId="{5CE2807D-387F-41AB-A493-CDD0CE48E5BC}" Directory_="x86_1_Dir" Attributes="0" KeyPath="git2106a5f2.dll_1"/>
     <ROW Component="libMagickCore2.dll" ComponentId="{858FD670-C906-401C-834B-AA69D5D7B106}" Directory_="APPDIR" Attributes="0" KeyPath="libMagickCore2.dll"/>
     <ROW Component="libMagickWand2.dll" ComponentId="{2E38FD24-82A5-432F-9847-E9A78CB2A5A6}" Directory_="APPDIR" Attributes="0" KeyPath="libMagickWand2.dll"/>
-    <ROW Component="libgit2106a5f2.dylib" ComponentId="{5C43C7F8-FA6A-4DFA-A79E-6E9D58264073}" Directory_="osx_Dir" Attributes="0" KeyPath="libgit2106a5f2.dylib" Type="0"/>
-    <ROW Component="libgit2106a5f2.so" ComponentId="{BBC8E395-EE58-4519-ADC2-91B52EB88641}" Directory_="alpinex64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_1" ComponentId="{8486919E-8025-4563-8ED5-02DCE8EB754A}" Directory_="alpine.3.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_1" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_2" ComponentId="{17FA8D37-2266-40ED-A5B2-BD78A7A1008C}" Directory_="debianarm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_2" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_3" ComponentId="{4810D88F-B06E-4C7F-A645-49E838E5DFF7}" Directory_="debian.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_3" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_4" ComponentId="{67204EC0-70C7-4175-9AA6-49B29B45EC76}" Directory_="fedorax64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_4" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_5" ComponentId="{273CC194-382B-4029-A734-34D7F5C0122D}" Directory_="linuxx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_5" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_6" ComponentId="{BC011615-79FC-4D4A-89AA-C899292BC35A}" Directory_="rhelx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_6" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_7" ComponentId="{EAC7C83F-C579-4225-966A-6517B91622C7}" Directory_="ubuntu.16.04arm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_7" Type="0"/>
-    <ROW Component="libgit2106a5f2.so_8" ComponentId="{857F80A6-743B-4FE8-B291-31F3E0CF019E}" Directory_="ubuntu.18.04x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_8" Type="0"/>
     <ROW Component="libiconv2.dll" ComponentId="{2700198B-26A6-4D84-93C7-8855FD014A13}" Directory_="APPDIR" Attributes="0" KeyPath="libiconv2.dll"/>
     <ROW Component="libjpeg7.dll" ComponentId="{88A7E4EB-DBA8-40A6-AB9A-54F0DE726F06}" Directory_="APPDIR" Attributes="0" KeyPath="libjpeg7.dll"/>
     <ROW Component="libpng120.dll" ComponentId="{45735C72-6B1C-421C-8F92-561795B2B945}" Directory_="APPDIR" Attributes="0" KeyPath="libpng120.dll"/>
@@ -847,20 +821,6 @@
     <ROW File="LibGit2Sharp.pdb" Component_="LibGit2Sharp.dll" FileName="LIBGIT~1.PDB|LibGit2Sharp.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\LibGit2Sharp.pdb" SelfReg="false"/>
     <ROW File="Tango.Git.dll" Component_="Tango.Git.dll" FileName="TANGOG~1.DLL|Tango.Git.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Git.dll" SelfReg="false"/>
     <ROW File="Tango.Git.pdb" Component_="Tango.Git.dll" FileName="TANGOG~1.PDB|Tango.Git.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Git.pdb" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so" Component_="libgit2106a5f2.so" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\alpine-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_1" Component_="libgit2106a5f2.so_1" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\alpine.3.9-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_2" Component_="libgit2106a5f2.so_2" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\debian-arm64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_3" Component_="libgit2106a5f2.so_3" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\debian.9-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_4" Component_="libgit2106a5f2.so_4" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\fedora-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_5" Component_="libgit2106a5f2.so_5" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\linux-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.dylib" Component_="libgit2106a5f2.dylib" FileName="LIBGIT~1.DYL|libgit2-106a5f2.dylib" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\osx\libgit2-106a5f2.dylib" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_6" Component_="libgit2106a5f2.so_6" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\rhel-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_7" Component_="libgit2106a5f2.so_7" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\ubuntu.16.04-arm64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="libgit2106a5f2.so_8" Component_="libgit2106a5f2.so_8" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\ubuntu.18.04-x64\libgit2-106a5f2.so" SelfReg="false"/>
-    <ROW File="git2106a5f2.dll" Component_="git2106a5f2.dll" FileName="GIT2-1~1.DLL|git2-106a5f2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\win32\x64\git2-106a5f2.dll" SelfReg="false"/>
-    <ROW File="git2106a5f2.pdb" Component_="git2106a5f2.dll" FileName="GIT2-1~1.PDB|git2-106a5f2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\win32\x64\git2-106a5f2.pdb" SelfReg="false"/>
-    <ROW File="git2106a5f2.dll_1" Component_="git2106a5f2.dll_1" FileName="GIT2-1~1.DLL|git2-106a5f2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\win32\x86\git2-106a5f2.dll" SelfReg="false"/>
-    <ROW File="git2106a5f2.pdb_1" Component_="git2106a5f2.dll_1" FileName="GIT2-1~1.PDB|git2-106a5f2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\lib\win32\x86\git2-106a5f2.pdb" SelfReg="false"/>
     <ROW File="LibGit2Sharp.dll.config" Component_="Dragablz.xml" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\LibGit2Sharp.dll.config" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
@@ -873,7 +833,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.2.3" 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.2.3"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.2.4" 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.2.4"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1344,18 +1304,6 @@
     <ROW Feature_="MachineStudio" Component_="Tango.ColorLib_v4.dll"/>
     <ROW Feature_="MachineStudio" Component_="LibGit2Sharp.dll"/>
     <ROW Feature_="MachineStudio" Component_="Tango.Git.dll"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_1"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_2"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_3"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_4"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_5"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.dylib"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_6"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_7"/>
-    <ROW Feature_="MachineStudio" Component_="libgit2106a5f2.so_8"/>
-    <ROW Feature_="MachineStudio" Component_="git2106a5f2.dll"/>
-    <ROW Feature_="MachineStudio" Component_="git2106a5f2.dll_1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
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 b8e82cc2b..25c81fcf4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
@@ -165,40 +165,6 @@ namespace Tango.MachineStudio.Common.Publish
                         throw new InvalidOperationException($"The local version '{local_version}' is not greater than the remote version '{remote_version}'.");
                     }
 
-                    if (Options.CreateTag)
-                    {
-                        String repoPath = Path.GetFullPath("../../../../../");
-                        using (GitRepositoryManager git = new GitRepositoryManager(repoPath, Options.Email, Options.PersonalAccessToken))
-                        {
-                            OnPublishProgress(0, 100, "Checking repository changes...");
-                            int changes = git.GetChanges().Count;
-                            if (changes > 0)
-                            {
-                                throw new InvalidOperationException($"There are {changes} uncommitted changes on the repository. Please commit and push all changes before creating the Tag");
-                            }
-
-                            OnPublishProgress(0, 100, "Checking outgoing commits...");
-                            int commits = git.GetOutgoingCommits().Count;
-                            if (commits > 0)
-                            {
-                                throw new InvalidOperationException($"There are {commits} outgoing commits on the repository. Please push all commits before creating the Tag");
-                            }
-
-                            String tagVersion = System.Version.Parse(GetLocalVersion()).ToString(3);
-                            String tagName = $"Machine_Studio_v{tagVersion}";
-                            String tagDescription = $"Snapshot of Machine Studio v{tagVersion}";
-
-                            git.Progress += (x, e) =>
-                            {
-                                OnPublishProgress(e.Progress.Value, e.Progress.Maximum, $"Pushing Tag '{tagName}'...");
-                            };
-
-                            OnPublishProgress(0, 100, $"Creating Tag '{tagName}'...");
-
-                            git.CreatePushTag(tagName, tagDescription, "Roy Ben Shabat");
-                        }
-                    }
-
                     OnPublishProgress(0, 100, $"Requesting version upload...");
 
                     var response = _client.UploadVersion(new UploadVersionRequest()
@@ -290,6 +256,55 @@ namespace Tango.MachineStudio.Common.Publish
                         throw new InvalidOperationException("The remote version does not seems to have been updated.");
                     }
 
+                    if (Options.CreateTag)
+                    {
+                        String repoPath = Path.GetFullPath("../../../../../");
+                        String tagVersion = System.Version.Parse(GetLocalVersion()).ToString(3);
+                        String tagName = $"Machine_Studio_v{tagVersion}";
+
+                        using (GitRepositoryManager git = new GitRepositoryManager(repoPath, Options.Email, Options.PersonalAccessToken))
+                        {
+                            OnPublishProgress(0, 100, "Checking repository changes...");
+                            int changes = git.GetChanges().Count;
+                            if (changes > 0)
+                            {
+                                if (Options.AutoCommitAndPush)
+                                {
+                                    OnPublishProgress(0, 100, "Committing repository changes...");
+                                    git.Commit(tagName);
+                                }
+                                else
+                                {
+                                    throw new InvalidOperationException($"There are {changes} uncommitted changes on the repository. Please commit and push all changes before creating the Tag");
+                                }
+                            }
+
+                            OnPublishProgress(0, 100, "Checking outgoing commits...");
+                            int commits = git.GetOutgoingCommits().Count;
+                            if (commits > 0)
+                            {
+                                if (Options.AutoCommitAndPush)
+                                {
+                                    OnPublishProgress(0, 100, "Pushing repository changes...");
+                                    git.Push();
+                                }
+                                else
+                                {
+                                    throw new InvalidOperationException($"There are {commits} outgoing commits on the repository. Please push all commits before creating the Tag");
+                                }
+                            }
+
+                            git.Progress += (x, e) =>
+                            {
+                                OnPublishProgress(e.Progress.Value, e.Progress.Maximum, $"Pushing Tag '{tagName}'...");
+                            };
+
+                            OnPublishProgress(0, 100, $"Creating Tag '{tagName}'...");
+
+                            git.CreatePushTag(tagName, Options.Comments, "Roy Ben Shabat");
+                        }
+                    }
+
                     OnPublishProgress(0, 0, "Version published successfully.");
                 }
                 catch (Exception ex)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/PublishOptions.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/PublishOptions.cs
index 80ca01149..c0983eb8b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/PublishOptions.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/PublishOptions.cs
@@ -95,6 +95,13 @@ namespace Tango.MachineStudio.Common.Publish
             set { _createTag = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _autoCommitAndSync;
+        public bool AutoCommitAndPush
+        {
+            get { return _autoCommitAndSync; }
+            set { _autoCommitAndSync = value; RaisePropertyChangedAuto(); }
+        }
+
         public PublishOptions()
         {
             BasePath = AppDomain.CurrentDomain.BaseDirectory + "..\\";
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/MainWindow.xaml
index 39513f1ea..cd23547c2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher.UI/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
         xmlns:web="clr-namespace:Tango.Web;assembly=Tango.Web"
         mc:Ignorable="d"
-        Title="Machine Studio Publisher" Height="600" Width="700" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize" Foreground="#202020" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
+        Title="Machine Studio Publisher" Height="620" Width="700" WindowStartupLocation="CenterScreen" WindowStyle="ToolWindow" ResizeMode="NoResize" Foreground="#202020" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">
 
     <Window.Resources>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
@@ -82,6 +82,7 @@
 
                         <StackPanel Margin="0 20 0 0">
                             <CheckBox x:Name="chkCreateTag" IsChecked="{Binding Options.CreateTag}">Create Tag On Repository</CheckBox>
+                            <CheckBox Margin="0 5 0 0" IsChecked="{Binding Options.AutoCommitAndPush}">Auto Commit &amp; Push</CheckBox>
                             <TextBlock Margin="0 10 0 0">Personal Access Token</TextBlock>
                             <TextBox BorderThickness="0 0 0 1" IsEnabled="{Binding ElementName=chkCreateTag,Path=IsChecked}" Margin="0 5 0 0" Text="{Binding Options.PersonalAccessToken}"></TextBox>
                         </StackPanel>
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 736c2ebca..6f104481b 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.2.3.0")]
+[assembly: AssemblyVersion("4.2.4.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 3783b54f8..7895a9355 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
@@ -669,7 +669,8 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
 
 if $(ConfigurationName) == Release del *.xml
 if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\"
-if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"</PostBuildEvent>
+if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"
+if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)lib\"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -680,7 +681,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"</PostBuildEven
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <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" />
+      <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" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file