PPC_v1.2.5

2 files changed, 103 insertions, 95 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index e8d1dd9c3..fddb0fccf 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{B70545A5-0F4B-41D7-8A1B-4988AB5B6B21} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{82BA609C-8C12-4819-9E65-CEFC9BA32500} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.2.4.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.2.5.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -228,26 +228,28 @@
     <ROW Component="Tango.WiFi.dll" ComponentId="{8082C9BD-5BDB-4C52-BCA6-E8604D4D232B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WiFi.dll"/>
     <ROW Component="WebRtc.NET.dll" ComponentId="{11563A6C-E1FC-4578-8BDD-8A8C30677126}" Directory_="APPDIR" Attributes="0" KeyPath="WebRtc.NET.dll"/>
     <ROW Component="WindowsInput.dll" ComponentId="{916884AD-CD7D-4AB0-8B3B-A2205ACFBDF4}" Directory_="APPDIR" Attributes="0" KeyPath="WindowsInput.dll"/>
-    <ROW Component="alpine.3.9x64" ComponentId="{CB3DEB2E-FE4C-4100-9EAE-415F45208180}" Directory_="alpine.3.9x64_Dir" Attributes="0"/>
-    <ROW Component="alpinex64" ComponentId="{72CBAAB2-6B3C-438B-BA67-500D34BE0DD5}" Directory_="alpinex64_Dir" Attributes="0"/>
-    <ROW Component="debian.9x64" ComponentId="{3AD4437F-641E-4B96-BB54-18E3B1B0A2D7}" Directory_="debian.9x64_Dir" Attributes="0"/>
-    <ROW Component="debianarm64" ComponentId="{6A227317-CDE4-4A4D-89FD-D00B70F14E18}" Directory_="debianarm64_Dir" Attributes="0"/>
-    <ROW Component="fedorax64" ComponentId="{121BA66E-6589-4AB4-B48F-83F1A5643753}" Directory_="fedorax64_Dir" Attributes="0"/>
-    <ROW Component="linuxx64" ComponentId="{E041A10C-C47F-4E71-9D09-BE0638FF1AC4}" Directory_="linuxx64_Dir" Attributes="0"/>
+    <ROW Component="git2106a5f2.dll" ComponentId="{6FF033EA-FA6D-46E3-8BAC-ACF8E58ECA32}" Directory_="x64_Dir" Attributes="256" KeyPath="git2106a5f2.dll"/>
+    <ROW Component="git2106a5f2.dll_1" ComponentId="{820A696D-246B-4C9C-A4D0-FE5233D91931}" Directory_="x86_Dir" Attributes="0" KeyPath="git2106a5f2.dll_1"/>
+    <ROW Component="libgit2106a5f2.dylib" ComponentId="{F477C4C4-1FCC-45F7-A415-F44C45229395}" Directory_="osx_Dir" Attributes="0" KeyPath="libgit2106a5f2.dylib" Type="0"/>
+    <ROW Component="libgit2106a5f2.so" ComponentId="{40FB6E4B-5B7B-4CAF-B913-A9026876C2B6}" Directory_="alpinex64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_1" ComponentId="{CC29599F-8275-4140-85F1-0EB01A19DBA7}" Directory_="alpine.3.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_1" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_2" ComponentId="{57C74BD5-3442-4D8F-8F4D-0FB538CD6497}" Directory_="debianarm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_2" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_3" ComponentId="{EF568E0F-CB24-41CF-BB97-28E0F1EE3FDE}" Directory_="debian.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_3" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_4" ComponentId="{06CA451E-96BA-426B-91D6-5F8FC9CDB024}" Directory_="fedorax64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_4" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_5" ComponentId="{BE66CDCE-0644-4CAC-AE4F-9892D784CAA4}" Directory_="linuxx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_5" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_6" ComponentId="{726C86FC-6C15-445F-B877-5911CA108742}" Directory_="rhelx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_6" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_7" ComponentId="{DA0E2B82-325E-47B0-B9E5-86BD72ED39BE}" Directory_="ubuntu.16.04arm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_7" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_8" ComponentId="{9568C112-4E7D-468E-9BAB-6BB9BFC1C264}" Directory_="ubuntu.18.04x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_8" Type="0"/>
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
-    <ROW Component="osx" ComponentId="{0DC599EF-C425-487B-96BB-2F9B972BF198}" Directory_="osx_Dir" Attributes="0"/>
     <ROW Component="protobufnet.dll" ComponentId="{163F1E17-6462-4ABE-BC86-E055F7690139}" Directory_="APPDIR" Attributes="0" KeyPath="protobufnet.dll"/>
-    <ROW Component="rhelx64" ComponentId="{76C245EC-C4CD-44BA-B634-46082E9F5689}" Directory_="rhelx64_Dir" Attributes="0"/>
-    <ROW Component="ubuntu.16.04arm64" ComponentId="{20707512-F0CB-4AEE-8C74-C4EFB5D5121F}" Directory_="ubuntu.16.04arm64_Dir" Attributes="0"/>
-    <ROW Component="ubuntu.18.04x64" ComponentId="{BE57FEBD-4942-4394-8859-F8003FB5148A}" Directory_="ubuntu.18.04x64_Dir" Attributes="0"/>
+    <ROW Component="turbojpeg.dll" ComponentId="{B478DD6D-C6E9-4E97-AA32-B55043FD6DF8}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
+    <ROW Component="turbojpeg.dll.meta" ComponentId="{A23A0095-43FB-4BA2-9C9B-645B2687FF76}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
+    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{FBEF5332-37EB-400D-A351-EBBA000CFF6C}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
+    <ROW Component="turbojpeg.dll_1" ComponentId="{0B6886FB-4BBD-4C48-A62F-2D4E438CD9CB}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll_1"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
-    <ROW Component="win7x64" ComponentId="{F1CC2A93-6B0C-475D-AF49-CCD5D4430668}" Directory_="win7x64_Dir" Attributes="0"/>
-    <ROW Component="win7x86" ComponentId="{02BC7433-536A-4FAA-83AB-5B0C7406F85D}" Directory_="win7x86_Dir" Attributes="0"/>
-    <ROW Component="x64" ComponentId="{3E0CECFA-175F-422E-852F-8103A67A83C3}" Directory_="x64_Dir" Attributes="0"/>
-    <ROW Component="x86" ComponentId="{DDE574A7-B6C7-4D28-A612-8AE0100A31F0}" Directory_="x86_Dir" Attributes="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
@@ -522,6 +524,25 @@
     <ROW File="Tango.DataStore.Remote.pdb" Component_="Tango.DataStore.Remote.dll" FileName="TANGOD~6.PDB|Tango.DataStore.Remote.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Remote.pdb" SelfReg="false"/>
     <ROW File="Tango.DataStore.Editing.dll" Component_="Tango.DataStore.Editing.dll" FileName="TANGOD~7.DLL|Tango.DataStore.Editing.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Editing.dll" SelfReg="false"/>
     <ROW File="Tango.DataStore.Editing.pdb" Component_="Tango.DataStore.Editing.dll" FileName="TANGOD~7.PDB|Tango.DataStore.Editing.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Editing.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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\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\PPC\Release\lib\win32\x86\git2-106a5f2.pdb" SelfReg="false"/>
+    <ROW File="LibGit2Sharp.dll.config" Component_="CommandLine.xml" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\LibGit2Sharp.dll.config" SelfReg="false"/>
+    <ROW File="turbojpeg.dll" Component_="turbojpeg.dll" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll" SelfReg="false"/>
+    <ROW File="turbojpeg.dll.meta" Component_="turbojpeg.dll.meta" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll.meta" SelfReg="false"/>
+    <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
+    <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -531,7 +552,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\PPC" PackageFileName="PPC Installer_v1.2.4" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.4"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.2.5" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.5"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -599,20 +620,6 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
     <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
-    <ROW Directory_="alpinex64_Dir" Component_="alpinex64" ManualDelete="false"/>
-    <ROW Directory_="alpine.3.9x64_Dir" Component_="alpine.3.9x64" ManualDelete="false"/>
-    <ROW Directory_="debianarm64_Dir" Component_="debianarm64" ManualDelete="false"/>
-    <ROW Directory_="debian.9x64_Dir" Component_="debian.9x64" ManualDelete="false"/>
-    <ROW Directory_="fedorax64_Dir" Component_="fedorax64" ManualDelete="false"/>
-    <ROW Directory_="linuxx64_Dir" Component_="linuxx64" ManualDelete="false"/>
-    <ROW Directory_="osx_Dir" Component_="osx" ManualDelete="false"/>
-    <ROW Directory_="rhelx64_Dir" Component_="rhelx64" ManualDelete="false"/>
-    <ROW Directory_="ubuntu.16.04arm64_Dir" Component_="ubuntu.16.04arm64" ManualDelete="false"/>
-    <ROW Directory_="ubuntu.18.04x64_Dir" Component_="ubuntu.18.04x64" ManualDelete="false"/>
-    <ROW Directory_="x64_Dir" Component_="x64" ManualDelete="false"/>
-    <ROW Directory_="x86_Dir" Component_="x86" ManualDelete="false"/>
-    <ROW Directory_="win7x64_Dir" Component_="win7x64" ManualDelete="false"/>
-    <ROW Directory_="win7x86_Dir" Component_="win7x86" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
@@ -818,20 +825,22 @@
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Lite.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Remote.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Editing.dll"/>
-    <ROW Feature_="MainFeature" Component_="win7x86"/>
-    <ROW Feature_="MainFeature" Component_="alpinex64"/>
-    <ROW Feature_="MainFeature" Component_="alpine.3.9x64"/>
-    <ROW Feature_="MainFeature" Component_="debianarm64"/>
-    <ROW Feature_="MainFeature" Component_="debian.9x64"/>
-    <ROW Feature_="MainFeature" Component_="fedorax64"/>
-    <ROW Feature_="MainFeature" Component_="linuxx64"/>
-    <ROW Feature_="MainFeature" Component_="osx"/>
-    <ROW Feature_="MainFeature" Component_="rhelx64"/>
-    <ROW Feature_="MainFeature" Component_="ubuntu.16.04arm64"/>
-    <ROW Feature_="MainFeature" Component_="ubuntu.18.04x64"/>
-    <ROW Feature_="MainFeature" Component_="x64"/>
-    <ROW Feature_="MainFeature" Component_="x86"/>
-    <ROW Feature_="MainFeature" Component_="win7x64"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_1"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_2"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_3"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_4"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_5"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.dylib"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_6"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_7"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_8"/>
+    <ROW Feature_="MainFeature" Component_="git2106a5f2.dll"/>
+    <ROW Feature_="MainFeature" Component_="git2106a5f2.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta_1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
index 62c4420d9..ed233f989 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
@@ -181,56 +181,6 @@ namespace Tango.PPC.Common.Publish
                         throw new InvalidOperationException($"The local firmware version '{local_firmware_version}' is not greater than the remote version '{remote_firmware_version}'.");
                     }
 
-                    if (Options.CreateTag)
-                    {
-                        String tagVersion = System.Version.Parse(GetLocalVersion()).ToString(3);
-                        String tagName = $"PPC_v{tagVersion}";
-                        String tagDescription = $"Snapshot of PPC v{tagVersion}";
-
-                        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)
-                            {
-                                if (Options.AutoCommitAndPush)
-                                {
-                                    OnPublishProgress(0, 100, "Committing repository changes...");
-                                    git.Commit($"Pre Tag '{tagName}' commit.");
-                                }
-                                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, tagDescription, "Roy Ben Shabat");
-                        }
-                    }
-
                     OnPublishProgress(0, 100, $"Requesting version upload...");
 
                     var response = _client.UploadVersion(new UploadVersionRequest()
@@ -301,6 +251,55 @@ namespace Tango.PPC.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 = $"PPC_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)