diff options
| -rw-r--r-- | Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip | 24 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 |
2 files changed, 4 insertions, 22 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 039660460..8413644ef 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:{DC6897A9-7B5B-413C-AA71-86F6147DE649} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{43036089-6F1D-4BD9-803D-996FF32DAD47} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Machine Studio"/> - <ROW Property="ProductVersion" Value="6.0.3.0" Type="32"/> + <ROW Property="ProductVersion" Value="6.0.4.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="-"/> @@ -82,11 +82,6 @@ <ROW Component="MaterialDesignColors.dll" ComponentId="{C79117BD-06D7-4004-8BBA-7E4B22B14955}" Directory_="APPDIR" Attributes="0" KeyPath="MaterialDesignColors.dll"/> <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.Azure.KeyVault.Core.dll" ComponentId="{80659340-C2DE-4196-9C28-E3047708B349}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.KeyVault.Core.dll"/> - <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{2350532D-AD9C-40A6-A70E-169F339F0451}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/> - <ROW Component="Microsoft.Data.OData.dll" ComponentId="{55F248A2-158B-42D6-B1BB-4D0EFA28E7CF}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/> - <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{B6076FF3-B531-4AF2-BAE4-17BD2870C982}" 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"/> @@ -228,7 +223,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="{A65F504C-A7EC-41BF-9C4F-3752037EFE25}" 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"/> @@ -557,7 +551,6 @@ <ROW File="System.Xml.XPath.XDocument.dll" Component_="System.Xml.XPath.XDocument.dll" FileName="SYST~106.DLL|System.Xml.XPath.XDocument.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\System.Xml.XPath.XDocument.dll" SelfReg="false"/> <ROW File="Tango.Documents.dll" Component_="Tango.Documents.dll" FileName="TANGOD~4.DLL|Tango.Documents.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Documents.dll" SelfReg="false"/> <ROW File="Tango.Documents.pdb" Component_="Tango.Documents.dll" FileName="TANGOD~4.PDB|Tango.Documents.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Documents.pdb" SelfReg="false"/> - <ROW File="Microsoft.Azure.ActiveDirectory.GraphClient.dll" Component_="Microsoft.Azure.ActiveDirectory.GraphClient.dll" FileName="MICRO~23.DLL|Microsoft.Azure.ActiveDirectory.GraphClient.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.Azure.ActiveDirectory.GraphClient.dll" SelfReg="false"/> <ROW File="Microsoft.SqlServer.ConnectionInfo.dll" Component_="Microsoft.SqlServer.ConnectionInfo.dll" FileName="MICRO~28.DLL|Microsoft.SqlServer.ConnectionInfo.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.ConnectionInfo.dll" SelfReg="false"/> <ROW File="Microsoft.SqlServer.Diagnostics.STrace.dll" Component_="Microsoft.SqlServer.Diagnostics.STrace.dll" FileName="MICRO~29.DLL|Microsoft.SqlServer.Diagnostics.STrace.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.Diagnostics.STrace.dll" SelfReg="false"/> <ROW File="Microsoft.SqlServer.Dmf.Common.dll" Component_="Microsoft.SqlServer.Dmf.Common.dll" FileName="MICRO~30.DLL|Microsoft.SqlServer.Dmf.Common.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.SqlServer.Dmf.Common.dll" SelfReg="false"/> @@ -822,12 +815,7 @@ <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"/> <ROW File="Tango.ColorLib_v5.dll" Component_="Tango.ColorLib_v5.dll" FileName="TANGO~23.DLL|Tango.ColorLib_v5.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.ColorLib_v5.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="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="Tango.ColorLib_v6.dll" Component_="Tango.ColorLib_v6.dll" FileName="TANGO~24.DLL|Tango.ColorLib_v6.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.ColorLib_v6.dll" SelfReg="false"/> - <ROW File="Microsoft.Azure.KeyVault.Core.dll" Component_="Microsoft.Azure.KeyVault.Core.dll" FileName="MICRO~39.DLL|Microsoft.Azure.KeyVault.Core.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Microsoft.Azure.KeyVault.Core.dll" SelfReg="false"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent"> <ROW RemoveFile="_" Options="3"/> @@ -839,7 +827,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_v6.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v6.0.3"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v6.0.4" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v6.0.4"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> @@ -999,7 +987,6 @@ <ROW Feature_="MachineStudio" Component_="MahApps.Metro.dll"/> <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.IdentityModel.Clients.ActiveDirectory.dll"/> <ROW Feature_="MachineStudio" Component_="Microsoft.SqlServer.AzureStorageEnum.dll"/> <ROW Feature_="MachineStudio" Component_="Microsoft.SqlServer.ConnectionInfo.dll"/> @@ -1308,12 +1295,7 @@ <ROW Feature_="MachineStudio" Component_="Tango.Colorful.dll"/> <ROW Feature_="MachineStudio" Component_="Tango.MachineStudio.ThreadExtensions.dll"/> <ROW Feature_="MachineStudio" Component_="Tango.ColorLib_v5.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_="System.Spatial.dll"/> <ROW Feature_="MachineStudio" Component_="Tango.ColorLib_v6.dll"/> - <ROW Feature_="MachineStudio" Component_="Microsoft.Azure.KeyVault.Core.dll"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent"> <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel <> 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 5ebb2d39e..b2c5cc8dc 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("6.0.3.0")] +[assembly: AssemblyVersion("6.0.4.0")] [assembly: ComVisible(false)]
\ No newline at end of file |