PPC_v1.7.8

1 files changed, 9 insertions, 16 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 4397d8feb..5f0600844 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:{326682B2-7E6A-44DA-939A-8075FD0B7B77} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{2EB83EBD-7508-4DD7-B9E4-7182425006B8} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.7.7.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.7.8.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="-"/>
@@ -217,13 +217,11 @@
     <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="protobufnet.dll" ComponentId="{163F1E17-6462-4ABE-BC86-E055F7690139}" Directory_="APPDIR" Attributes="0" KeyPath="protobufnet.dll"/>
-    <ROW Component="turbojpeg.dll" ComponentId="{EE117145-6194-4E55-B851-70D05369DF36}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
-    <ROW Component="turbojpeg.dll.meta" ComponentId="{6783DDAF-86A0-4553-805E-AC54DD495A0B}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
-    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{96B7258E-479E-4570-83BE-3A64965A43FE}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
-    <ROW Component="turbojpeg.dll_1" ComponentId="{8CEF5053-3211-41EE-AFD9-4F92DD80D75E}" 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="{5FE69239-D0EC-4DB6-9960-C4202AC44985}" Directory_="win7x64_Dir" Attributes="0"/>
+    <ROW Component="win7x86" ComponentId="{1EE5BE61-C29E-495A-BF21-92487A654851}" Directory_="win7x86_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"/>
@@ -487,11 +485,6 @@
     <ROW File="Tango.PPC.JobsV2.dll.config" Component_="CommandLine.xml" FileName="TANGO~14.CON|Tango.PPC.JobsV2.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.JobsV2.dll.config" SelfReg="false"/>
     <ROW File="Tango.PPC.JobsV2.pdb" Component_="Tango.PPC.JobsV2.dll" FileName="TANGO~16.PDB|Tango.PPC.JobsV2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.JobsV2.pdb" SelfReg="false"/>
     <ROW File="Tango.ColorLib_v5.dll" Component_="Tango.ColorLib_v5.dll" FileName="TANGO~16.DLL|Tango.ColorLib_v5.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.ColorLib_v5.dll" 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"/>
     <ROW File="HiraokaHyperTools.PdfSharpWPF.dll" Component_="HiraokaHyperTools.PdfSharpWPF.dll" FileName="HIRAOK~1.DLL|HiraokaHyperTools.PdfSharp-WPF.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\HiraokaHyperTools.PdfSharp-WPF.dll" SelfReg="false"/>
     <ROW File="HiraokaHyperTools.PdfSharp.Xps.dll" Component_="HiraokaHyperTools.PdfSharp.Xps.dll" FileName="HIRAOK~2.DLL|HiraokaHyperTools.PdfSharp.Xps.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\HiraokaHyperTools.PdfSharp.Xps.dll" SelfReg="false"/>
     <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~5.DLL|Microsoft.Data.Edm.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Edm.dll" SelfReg="false"/>
@@ -509,7 +502,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.7.7" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.7.7"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.7.8" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.7.8"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -577,6 +570,8 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
     <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
+    <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]"/>
@@ -775,10 +770,6 @@
     <ROW Feature_="MainFeature" Component_="Tango.ColorPickers.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.JobsV2.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.ColorLib_v5.dll"/>
-    <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"/>
     <ROW Feature_="MainFeature" Component_="HiraokaHyperTools.PdfSharpWPF.dll"/>
     <ROW Feature_="MainFeature" Component_="HiraokaHyperTools.PdfSharp.Xps.dll"/>
     <ROW Feature_="MainFeature" Component_="Microsoft.Data.Edm.dll"/>
@@ -786,6 +777,8 @@
     <ROW Feature_="MainFeature" Component_="Microsoft.Data.Services.Client.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PDF.dll"/>
+    <ROW Feature_="MainFeature" Component_="win7x64"/>
+    <ROW Feature_="MainFeature" Component_="win7x86"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>