Machine_Studio_v4.8.2

2 files changed, 4 insertions, 16 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 a6925bd39..a44e0f3a5 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:{F8EB6A32-C529-4829-A0B3-CDEE8C6D680A} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{9859AD03-20F4-4303-946E-B12B641EDE12} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.8.1.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.8.2.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="-"/>
@@ -83,9 +83,6 @@
     <ROW Component="MaterialDesignThemes.Wpf.dll" ComponentId="{D4A89F22-F969-46C3-915C-C565E7BE99D1}" Directory_="APPDIR" Attributes="0" KeyPath="MaterialDesignThemes.Wpf.dll"/>
     <ROW Component="Microsoft.AspNet.SignalR.Client.dll" ComponentId="{A6A1BE43-A965-4718-8B9B-E8BB2D2B6FA9}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.AspNet.SignalR.Client.dll"/>
     <ROW Component="Microsoft.Azure.ActiveDirectory.GraphClient.dll" ComponentId="{623FE6DD-F44D-4E99-8FD5-E54A608BE511}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
-    <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{EDCC7B37-EDA4-49B9-9EFE-B97A521C4A59}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
-    <ROW Component="Microsoft.Data.OData.dll" ComponentId="{68EB5234-BB29-4401-BB88-9890A113018B}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
-    <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{DD76760A-A425-40C6-9130-D21D4D25DBAE}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{C8FF51E6-B8BB-401D-BD03-58FD08E4C389}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.Practices.ServiceLocation.dll" ComponentId="{FD4F5E8C-62FB-4E90-8AFE-91B6F9458007}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Practices.ServiceLocation.dll"/>
     <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{B19BCB1E-6C52-4BF7-A128-DDA1DC047D0E}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/>
@@ -227,7 +224,6 @@
     <ROW Component="System.Security.Cryptography.X509Certificates.dll" ComponentId="{00F4F6C1-6B4D-4DFD-BD59-72EE690FC246}" Directory_="APPDIR" Attributes="0" KeyPath="System.Security.Cryptography.X509Certificates.dll"/>
     <ROW Component="System.Security.Principal.dll" ComponentId="{127424E0-24F8-456F-BBEC-F23E331E1669}" Directory_="APPDIR" Attributes="0" KeyPath="System.Security.Principal.dll"/>
     <ROW Component="System.Security.SecureString.dll" ComponentId="{C40FA779-F72E-4CF2-9A42-368ADB1D05E4}" Directory_="APPDIR" Attributes="0" KeyPath="System.Security.SecureString.dll"/>
-    <ROW Component="System.Spatial.dll" ComponentId="{C23281B5-3890-4BE5-9B1E-8A7C92E3090A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
     <ROW Component="System.Text.Encoding.Extensions.dll" ComponentId="{C177E423-71AE-4FB7-BDC1-1FFF650EFEBC}" Directory_="APPDIR" Attributes="0" KeyPath="System.Text.Encoding.Extensions.dll"/>
     <ROW Component="System.Text.Encoding.dll" ComponentId="{903DBCE1-0C97-4F99-BF85-41B54EF26B33}" Directory_="APPDIR" Attributes="0" KeyPath="System.Text.Encoding.dll"/>
     <ROW Component="System.Text.RegularExpressions.dll" ComponentId="{BFF6B45B-522B-44D6-8421-EC4B091B3DB5}" Directory_="APPDIR" Attributes="0" KeyPath="System.Text.RegularExpressions.dll"/>
@@ -582,9 +578,6 @@
     <ROW File="Tango.AdvancedInstaller.dll" Component_="Tango.AdvancedInstaller.dll" FileName="TANGOA~2.DLL|Tango.AdvancedInstaller.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.AdvancedInstaller.dll" SelfReg="false"/>
     <ROW File="Tango.AdvancedInstaller.pdb" Component_="Tango.AdvancedInstaller.dll" FileName="TANGOA~2.PDB|Tango.AdvancedInstaller.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.AdvancedInstaller.pdb" SelfReg="false"/>
     <ROW File="EFCache.dll" Component_="EFCache.dll" FileName="EFCache.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\EFCache.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICRO~24.DLL|Microsoft.Data.Edm.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.Data.Edm.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICRO~25.DLL|Microsoft.Data.OData.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.Data.OData.dll" SelfReg="false"/>
-    <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICRO~26.DLL|Microsoft.Data.Services.Client.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.Data.Services.Client.dll" SelfReg="false"/>
     <ROW File="AForge.dll" Component_="AForge.dll" FileName="AForge.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\MachineStudio\Modules\Tango.MachineStudio.ColorCapture\bin\Release\AForge.dll" SelfReg="false"/>
     <ROW File="AForge.Imaging.dll" Component_="AForge.Imaging.dll" FileName="AFORGE~1.DLL|AForge.Imaging.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\MachineStudio\Modules\Tango.MachineStudio.ColorCapture\bin\Release\AForge.Imaging.dll" SelfReg="false"/>
     <ROW File="AForge.Math.dll" Component_="AForge.Math.dll" FileName="AFORGE~2.DLL|AForge.Math.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\MachineStudio\Modules\Tango.MachineStudio.ColorCapture\bin\Release\AForge.Math.dll" SelfReg="false"/>
@@ -701,7 +694,6 @@
     <ROW File="System.IdentityModel.Tokens.Jwt.dll" Component_="System.IdentityModel.Tokens.Jwt.dll" FileName="SYSTEM~4.DLL|System.IdentityModel.Tokens.Jwt.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\System.IdentityModel.Tokens.Jwt.dll" SelfReg="false"/>
     <ROW File="System.IdentityModel.Tokens.Jwt.pdb" Component_="System.IdentityModel.Tokens.Jwt.dll" FileName="SYSTEM~1.PDB|System.IdentityModel.Tokens.Jwt.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\System.IdentityModel.Tokens.Jwt.pdb" SelfReg="false"/>
     <ROW File="System.Reactive.Windows.Threading.dll" Component_="System.Reactive.Windows.Threading.dll" FileName="SYSTE~10.DLL|System.Reactive.Windows.Threading.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\System.Reactive.Windows.Threading.dll" SelfReg="false"/>
-    <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~11.DLL|System.Spatial.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\System.Spatial.dll" SelfReg="false"/>
     <ROW File="System.Web.Razor.dll" Component_="System.Web.Razor.dll" FileName="SYST~109.DLL|System.Web.Razor.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\System.Web.Razor.dll" SelfReg="false"/>
     <ROW File="Tango.AnimatedGif.dll" Component_="Tango.AnimatedGif.dll" FileName="TANGOA~3.DLL|Tango.AnimatedGif.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.AnimatedGif.dll" SelfReg="false"/>
     <ROW File="Tango.AnimatedGif.pdb" Component_="Tango.AnimatedGif.dll" FileName="TANGOA~3.PDB|Tango.AnimatedGif.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.AnimatedGif.pdb" SelfReg="false"/>
@@ -843,7 +835,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.8.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.8.1"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.8.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.8.2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1004,9 +996,6 @@
     <ROW Feature_="MachineStudio" Component_="MaterialDesignColors.dll"/>
     <ROW Feature_="MachineStudio" Component_="MaterialDesignThemes.Wpf.dll"/>
     <ROW Feature_="MachineStudio" Component_="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/>
-    <ROW Feature_="MachineStudio" Component_="Microsoft.Data.Edm.dll"/>
-    <ROW Feature_="MachineStudio" Component_="Microsoft.Data.OData.dll"/>
-    <ROW Feature_="MachineStudio" Component_="Microsoft.Data.Services.Client.dll"/>
     <ROW Feature_="MachineStudio" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Feature_="MachineStudio" Component_="Microsoft.SqlServer.AzureStorageEnum.dll"/>
     <ROW Feature_="MachineStudio" Component_="Microsoft.SqlServer.ConnectionInfo.dll"/>
@@ -1199,7 +1188,6 @@
     <ROW Feature_="MachineStudio" Component_="System.Data.SQLite.Linq.dll"/>
     <ROW Feature_="MachineStudio" Component_="System.IdentityModel.Tokens.Jwt.dll"/>
     <ROW Feature_="MachineStudio" Component_="System.Reactive.Windows.Threading.dll"/>
-    <ROW Feature_="MachineStudio" Component_="System.Spatial.dll"/>
     <ROW Feature_="MachineStudio" Component_="System.Web.Razor.dll"/>
     <ROW Feature_="MachineStudio" Component_="Tango.AnimatedGif.dll"/>
     <ROW Feature_="MachineStudio" Component_="Tango.BrushPicker.dll"/>
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 7814d5962..752068c54 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.8.1.0")]
+[assembly: AssemblyVersion("4.8.2.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file