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

5 files changed, 17 insertions, 8 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 3ec64fec1..3024873d1 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:{E00E88C5-DC57-4258-8462-B82F65540CAB} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{FC64CD9B-11E0-41AF-B180-BFCE3E865101} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.7.2.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.8.0.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="-"/>
@@ -841,7 +841,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.7.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.7.2"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.8.0" 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.8.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
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 5fe5afe5a..a603ff06b 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 3a1a3228b..877b8a240 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:{6AF367D4-90AA-4AFF-A7A6-5DFCCC6BC562} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{158429FA-1E10-45D2-BB15-D4D9C773EFDA} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.6.9.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.7.0.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="-"/>
@@ -149,6 +149,7 @@
     <ROW Component="Tango.ColorLib_v2.dll" ComponentId="{BF397BA6-85CE-4A7A-9C1B-76F8FD3210D8}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorLib_v2.dll"/>
     <ROW Component="Tango.ColorLib_v3.dll" ComponentId="{3264F593-EBB0-4AAB-BC34-AF382E485620}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorLib_v3.dll"/>
     <ROW Component="Tango.ColorLib_v4.dll" ComponentId="{ECFA3C0A-1834-4F60-9A19-5AB6DA9CB5E6}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorLib_v4.dll"/>
+    <ROW Component="Tango.ColorPickers.dll" ComponentId="{2E88F488-38BD-4699-85BB-1F7A9B07BD10}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorPickers.dll"/>
     <ROW Component="Tango.Colorful.dll" ComponentId="{E8688854-380A-4FF5-9F97-A6C91763959F}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Colorful.dll"/>
     <ROW Component="Tango.Console.dll" ComponentId="{9F335170-14FF-472E-B3A5-1AAFA7C3067B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Console.dll"/>
     <ROW Component="Tango.Core.dll" ComponentId="{4DF6644D-C4EC-419D-9622-2F79BBBC5A3F}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Core.dll"/>
@@ -176,6 +177,7 @@
     <ROW Component="Tango.PPC.Common.dll" ComponentId="{9CE1BBB9-9F11-4BF3-98DD-FEC34639E94E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Common.dll"/>
     <ROW Component="Tango.PPC.Events.dll" ComponentId="{D5E0FDF6-DD06-46FB-A7AE-013BA72979C5}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Events.dll"/>
     <ROW Component="Tango.PPC.Jobs.dll" ComponentId="{33A3CD47-B643-4119-804A-814A7FACF534}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Jobs.dll"/>
+    <ROW Component="Tango.PPC.JobsV2.dll" ComponentId="{FCB37A57-713C-4292-9BEB-F1B3D6606F13}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.JobsV2.dll"/>
     <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.Auth2.dll" ComponentId="{9D638EFF-9BDF-4903-AFB5-8015EB34B6F2}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.Auth2.dll"/>
@@ -469,6 +471,11 @@
     <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="Tango.Colorful.dll" Component_="Tango.Colorful.dll" FileName="TANGO~12.DLL|Tango.Colorful.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Colorful.dll" SelfReg="false"/>
     <ROW File="Tango.Colorful.pdb" Component_="Tango.Colorful.dll" FileName="TANGOC~6.PDB|Tango.Colorful.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Colorful.pdb" SelfReg="false"/>
+    <ROW File="Tango.ColorPickers.dll" Component_="Tango.ColorPickers.dll" FileName="TANGO~14.DLL|Tango.ColorPickers.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.ColorPickers.dll" SelfReg="false"/>
+    <ROW File="Tango.ColorPickers.pdb" Component_="Tango.ColorPickers.dll" FileName="TANGOC~7.PDB|Tango.ColorPickers.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.ColorPickers.pdb" SelfReg="false"/>
+    <ROW File="Tango.PPC.JobsV2.dll" Component_="Tango.PPC.JobsV2.dll" FileName="TANGO~15.DLL|Tango.PPC.JobsV2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.JobsV2.dll" SelfReg="false"/>
+    <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"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -478,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.6.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.6.9"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.7.0" 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.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -745,6 +752,8 @@
     <ROW Feature_="MainFeature" Component_="Tango.Colorful.dll"/>
     <ROW Feature_="MainFeature" Component_="win7x86"/>
     <ROW Feature_="MainFeature" Component_="win7x64"/>
+    <ROW Feature_="MainFeature" Component_="Tango.ColorPickers.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.PPC.JobsV2.dll"/>
   </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/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 1ec481216..3455cda80 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.7.2.0")]
+[assembly: AssemblyVersion("4.8.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 78e367f87..33696efaa 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")] 
-[assembly: AssemblyVersion("1.6.9.0")]
+[assembly: AssemblyVersion("1.7.0.0")]