Machine_Studio_v4.7.0

2 files changed, 9 insertions, 4 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 00a1d7d21..27b703409 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:{7B884D81-783D-485D-A274-9AD3D0134DF7} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{85D07BEE-84BA-4E70-96CB-5EF0C0F9A58B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.6.1.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.7.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="-"/>
@@ -300,6 +300,7 @@
     <ROW Component="Tango.MachineStudio.Storage.dll" ComponentId="{150A14D5-9060-43B4-A065-F06BCB79754C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Storage.dll"/>
     <ROW Component="Tango.MachineStudio.Stubs.dll" ComponentId="{024CD63F-A137-4361-9EC6-3E01973D2AD0}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Stubs.dll"/>
     <ROW Component="Tango.MachineStudio.Technician.dll" ComponentId="{17B02BB8-CEFB-4443-AC64-7DEA8DD011A0}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Technician.dll"/>
+    <ROW Component="Tango.MachineStudio.ThreadExtensions.dll" ComponentId="{7ED78001-3874-487A-8FD4-9EB90064A12E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.ThreadExtensions.dll"/>
     <ROW Component="Tango.MachineStudio.UI.exe" ComponentId="{07F681E1-2AA2-4807-AD8C-E34D9569AB96}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.UI.exe"/>
     <ROW Component="Tango.MachineStudio.Updater.exe" ComponentId="{5FA7D1EC-ED4A-46D6-BD92-42479D1BD560}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Updater.exe"/>
     <ROW Component="Tango.MachineStudio.UsersAndRoles.dll" ComponentId="{03566F7E-9428-46EF-991F-4524511179B0}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.UsersAndRoles.dll"/>
@@ -826,6 +827,9 @@
     <ROW File="Z.Expressions.Eval.dll" Component_="Z.Expressions.Eval.dll" FileName="ZEXPRE~1.DLL|Z.Expressions.Eval.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Z.Expressions.Eval.dll" SelfReg="false"/>
     <ROW File="Tango.Colorful.dll" Component_="Tango.Colorful.dll" FileName="TANGO~22.DLL|Tango.Colorful.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Colorful.dll" SelfReg="false"/>
     <ROW File="Tango.Colorful.pdb" Component_="Tango.Colorful.dll" FileName="TANGOC~8.PDB|Tango.Colorful.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Colorful.pdb" SelfReg="false"/>
+    <ROW File="Tango.MachineStudio.ThreadExtensions.dll" Component_="Tango.MachineStudio.ThreadExtensions.dll" FileName="TANGOM~5.DLL|Tango.MachineStudio.ThreadExtensions.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.MachineStudio.ThreadExtensions.dll" SelfReg="false"/>
+    <ROW File="Tango.MachineStudio.ThreadExtensions.dll.config" Component_="Dragablz.xml" FileName="TANGOM~5.CON|Tango.MachineStudio.ThreadExtensions.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.MachineStudio.ThreadExtensions.dll.config" SelfReg="false"/>
+    <ROW File="Tango.MachineStudio.ThreadExtensions.pdb" Component_="Tango.MachineStudio.ThreadExtensions.dll" FileName="TANGOM~5.PDB|Tango.MachineStudio.ThreadExtensions.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.MachineStudio.ThreadExtensions.pdb" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
     <ROW RemoveFile="_" Options="3"/>
@@ -837,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.6.1" 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.6.1"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.7.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.7.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1310,6 +1314,7 @@
     <ROW Feature_="MachineStudio" Component_="Z.EntityFramework.Plus.EF6.dll"/>
     <ROW Feature_="MachineStudio" Component_="Z.Expressions.Eval.dll"/>
     <ROW Feature_="MachineStudio" Component_="Tango.Colorful.dll"/>
+    <ROW Feature_="MachineStudio" Component_="Tango.MachineStudio.ThreadExtensions.dll"/>
   </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.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 73bbd1b03..25d3f14e1 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.6.1.0")]
+[assembly: AssemblyVersion("4.7.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file