Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 34 insertions, 9 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index a603ff06b..9453b5c13 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 8fa2a5a64..a4591cd17 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:{DD512361-F5F7-4CDC-B7F9-EF14461A8297} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{40872ACA-7FB8-4AB8-8394-0323B54B999F} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.1.24.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.1.25.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="-"/>
@@ -70,6 +70,8 @@
     <ROW Component="JWT.dll" ComponentId="{12CB754C-9DF5-4CD5-A0B5-9CD01565E5AA}" Directory_="APPDIR" Attributes="0" KeyPath="JWT.dll"/>
     <ROW Component="License.lic" ComponentId="{B84D4593-1241-47D3-9B15-3CD1CB01EC12}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="License.lic" Type="0"/>
     <ROW Component="LiteDB.dll" ComponentId="{C9EB8944-C9EB-4EC0-B1F1-37BF3A93F40B}" Directory_="APPDIR" Attributes="0" KeyPath="LiteDB.dll"/>
+    <ROW Component="MaterialDesignColors.dll" ComponentId="{E0CDB408-AAFE-4B88-A25D-17CC17D808E8}" Directory_="APPDIR" Attributes="0" KeyPath="MaterialDesignColors.dll"/>
+    <ROW Component="MaterialDesignThemes.Wpf.dll" ComponentId="{A9B9A2B3-AB31-4A89-9427-41EF78B4F36A}" Directory_="APPDIR" Attributes="0" KeyPath="MaterialDesignThemes.Wpf.dll"/>
     <ROW Component="Microsoft.AspNet.SignalR.Client.dll" ComponentId="{67880289-7229-45A8-8C62-86976F5D82FD}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.AspNet.SignalR.Client.dll"/>
     <ROW Component="Microsoft.Azure.ActiveDirectory.GraphClient.dll" ComponentId="{22120595-72BC-48DE-8A62-DF63A46B7C51}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
     <ROW Component="Microsoft.Azure.Common.NetFramework.dll" ComponentId="{894F089D-C807-489A-8523-388645F4D876}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.NetFramework.dll"/>
@@ -163,6 +165,7 @@
     <ROW Component="Tango.FirmwareUpdateLib.WPF.dll" ComponentId="{114351FD-08EC-44C4-AFFD-82357F567E58}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.FirmwareUpdateLib.WPF.dll"/>
     <ROW Component="Tango.FirmwareUpdateLib.dll" ComponentId="{627301CE-4E54-4E87-9062-E5E6119C8844}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.FirmwareUpdateLib.dll"/>
     <ROW Component="Tango.Hive.dll" ComponentId="{CA2CADC4-F5ED-4ECA-BCB9-E4C0EE085DFA}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Hive.dll"/>
+    <ROW Component="Tango.Insights.dll" ComponentId="{55ACC084-83B4-490F-9D24-12A124B93112}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Insights.dll"/>
     <ROW Component="Tango.Integration.dll" ComponentId="{EB75ED71-2EA7-46AE-85AA-6F1DE5A90911}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Integration.dll"/>
     <ROW Component="Tango.Logging.dll" ComponentId="{1762D371-771C-48D9-8890-CF88B2F4B94C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Logging.dll"/>
     <ROW Component="Tango.PMR.dll" ComponentId="{DF42D887-D9F9-44A1-95A3-605A057E66DF}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PMR.dll"/>
@@ -176,6 +179,8 @@
     <ROW Component="Tango.PPC.MachineSettings.dll" ComponentId="{1FD6EEEA-0DE3-4ED2-A3BB-033E5F0E1F4D}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.MachineSettings.dll"/>
     <ROW Component="Tango.PPC.Maintenance.dll" ComponentId="{F5E90747-F99F-493B-8CA5-0929FBE77C13}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Maintenance.dll"/>
     <ROW Component="Tango.PPC.Packages.CefInstaller.dll" ComponentId="{EB7A5008-6488-43B7-97E1-3B6E43315BBB}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.CefInstaller.dll"/>
+    <ROW Component="Tango.PPC.Packages.JobRunsStartTimePatch.dll" ComponentId="{F680010B-E063-428A-84C7-1FEB9E253502}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.JobRunsStartTimePatch.dll"/>
+    <ROW Component="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" ComponentId="{B588371F-F16E-495E-83EC-CA7089242B07}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" Type="0"/>
     <ROW Component="Tango.PPC.Packages.SamplePostPackage.dll" ComponentId="{B5384C95-9D5A-48EE-A938-DBFE32FC2E25}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.SamplePostPackage.dll"/>
     <ROW Component="Tango.PPC.Packages.SamplePrePackage.dll" ComponentId="{30CD58AB-F4B9-4690-8962-DCBAB4DD059D}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.SamplePrePackage.dll"/>
     <ROW Component="Tango.PPC.Shared.dll" ComponentId="{AA769313-AC05-4C33-A72C-43CF04DF6EBD}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Shared.dll"/>
@@ -203,11 +208,13 @@
     <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="{2378880E-5924-46DD-9F91-69035B6EB3B1}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
+    <ROW Component="turbojpeg.dll.meta" ComponentId="{19F60335-93D3-40EB-B575-B63069924ACA}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
+    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{19E8A96F-F962-4D4F-86A9-7D1CC230BD41}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
+    <ROW Component="turbojpeg.dll_1" ComponentId="{3627756D-DA39-41D4-8663-1C6D4CB8455E}" 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="{95A44DE0-26DE-45A2-A0BE-7ECBDB452AF4}" Directory_="win7x64_Dir" Attributes="0"/>
-    <ROW Component="win7x86" ComponentId="{3FE8C851-0790-4F51-8F1D-FF55D9CE03D5}" 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"/>
@@ -456,6 +463,19 @@
     <ROW File="Tango.PPC.Shared.pdb" Component_="Tango.PPC.Shared.dll" FileName="TANGO~17.PDB|Tango.PPC.Shared.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Shared.pdb" SelfReg="false"/>
     <ROW File="Tango.CSV.dll" Component_="Tango.CSV.dll" FileName="TANGOC~8.DLL|Tango.CSV.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.CSV.dll" SelfReg="false"/>
     <ROW File="Tango.CSV.pdb" Component_="Tango.CSV.dll" FileName="TANGOC~5.PDB|Tango.CSV.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.CSV.pdb" SelfReg="false"/>
+    <ROW File="MaterialDesignColors.dll" Component_="MaterialDesignColors.dll" FileName="MATERI~1.DLL|MaterialDesignColors.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\MaterialDesignColors.dll" SelfReg="false"/>
+    <ROW File="MaterialDesignColors.pdb" Component_="MaterialDesignColors.dll" FileName="MATERI~1.PDB|MaterialDesignColors.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\MaterialDesignColors.pdb" SelfReg="false"/>
+    <ROW File="MaterialDesignThemes.Wpf.dll" Component_="MaterialDesignThemes.Wpf.dll" FileName="MATERI~2.DLL|MaterialDesignThemes.Wpf.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\MaterialDesignThemes.Wpf.dll" SelfReg="false"/>
+    <ROW File="MaterialDesignThemes.Wpf.pdb" Component_="MaterialDesignThemes.Wpf.dll" FileName="MATERI~2.PDB|MaterialDesignThemes.Wpf.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\MaterialDesignThemes.Wpf.pdb" SelfReg="false"/>
+    <ROW File="Tango.PPC.Packages.JobRunsStartTimePatch.dll" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll" FileName="TANGOP~4.DLL|Tango.PPC.Packages.JobRunsStartTimePatch.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.JobRunsStartTimePatch.dll" SelfReg="false"/>
+    <ROW File="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" FileName="TANGOP~1.CON|Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" SelfReg="false"/>
+    <ROW File="Tango.PPC.Packages.JobRunsStartTimePatch.pdb" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll" FileName="TANGOP~4.PDB|Tango.PPC.Packages.JobRunsStartTimePatch.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.JobRunsStartTimePatch.pdb" SelfReg="false"/>
+    <ROW File="Tango.Insights.dll" Component_="Tango.Insights.dll" FileName="TANGOI~2.DLL|Tango.Insights.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Insights.dll" SelfReg="false"/>
+    <ROW File="Tango.Insights.pdb" Component_="Tango.Insights.dll" FileName="TANGOI~2.PDB|Tango.Insights.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Insights.pdb" 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">
@@ -465,7 +485,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.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.1.24"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.1.25"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -533,8 +553,6 @@
   <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]"/>
@@ -726,8 +744,15 @@
     <ROW Feature_="MainFeature" Component_="LiteDB.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.PPC.Shared.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.CSV.dll"/>
-    <ROW Feature_="MainFeature" Component_="win7x86"/>
-    <ROW Feature_="MainFeature" Component_="win7x64"/>
+    <ROW Feature_="MainFeature" Component_="MaterialDesignColors.dll"/>
+    <ROW Feature_="MainFeature" Component_="MaterialDesignThemes.Wpf.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config"/>
+    <ROW Feature_="MainFeature" Component_="Tango.Insights.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"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>