diff options
Diffstat (limited to 'Software/Visual_Studio')
3 files changed, 26 insertions, 4 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 Binary files differindex 5fe5afe5a..1a2038cfa 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 efc3cef69..c5e2ef201 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:{46B78E9C-5E91-434C-A688-56E40C26A1CE} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{62757A2D-4B8C-4367-B722-B0CC315586FF} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Tango"/> - <ROW Property="ProductVersion" Value="1.7.5.0" Type="32"/> + <ROW Property="ProductVersion" Value="1.7.6.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="-"/> @@ -63,6 +63,8 @@ <ROW Component="FluentFTP.dll" ComponentId="{212CBAE7-9A31-46CD-AA9C-2585FB7EC2E5}" Directory_="APPDIR" Attributes="0" KeyPath="FluentFTP.dll"/> <ROW Component="FontAwesome.WPF.dll" ComponentId="{303DB9BF-511C-4AAB-8DD9-C0B773679FFF}" Directory_="APPDIR" Attributes="0" KeyPath="FontAwesome.WPF.dll"/> <ROW Component="Google.Protobuf.dll" ComponentId="{974E6663-6A5F-4596-A2A1-BBD1B21850E8}" Directory_="APPDIR" Attributes="0" KeyPath="Google.Protobuf.dll"/> + <ROW Component="HiraokaHyperTools.PdfSharp.Xps.dll" ComponentId="{E3D33F73-8C26-4DE7-A9E4-805515A4AC97}" Directory_="APPDIR" Attributes="0" KeyPath="HiraokaHyperTools.PdfSharp.Xps.dll"/> + <ROW Component="HiraokaHyperTools.PdfSharpWPF.dll" ComponentId="{75AEF5A7-47EE-48C0-81F4-859A3BA55C96}" Directory_="APPDIR" Attributes="0" KeyPath="HiraokaHyperTools.PdfSharpWPF.dll"/> <ROW Component="Hyak.Common.dll" ComponentId="{66A90964-5F71-496C-BD17-94B52D23C85A}" Directory_="APPDIR" Attributes="0" KeyPath="Hyak.Common.dll"/> <ROW Component="Interop.MSDASC.dll" ComponentId="{3647192B-5FC3-4A46-A5EC-C1F567484FC7}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="Interop.MSDASC.dll"/> <ROW Component="Ionic.Zip.dll" ComponentId="{29346878-A0EB-43A8-B311-98B8576FC3A4}" Directory_="APPDIR" Attributes="0" KeyPath="Ionic.Zip.dll"/> @@ -75,6 +77,9 @@ <ROW Component="Microsoft.Azure.Common.NetFramework.dll" ComponentId="{894F089D-C807-489A-8523-388645F4D876}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.NetFramework.dll"/> <ROW Component="Microsoft.Azure.Common.dll" ComponentId="{4A8F7880-DE1E-4E8F-80E5-6DE1E14B4702}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.dll"/> <ROW Component="Microsoft.Azure.ResourceManager.dll" ComponentId="{A00E27AE-9ED8-413F-9975-8C0B2D4C7BBE}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ResourceManager.dll"/> + <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{731E9E18-5B5E-4B85-8910-80FEAE1864F8}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/> + <ROW Component="Microsoft.Data.OData.dll" ComponentId="{B0042178-54E4-4F2C-8085-43EF0792B82C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/> + <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{804D6DEA-EB5E-4FA8-A9C9-D3F60F51BB59}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/> <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{4E807C1E-3E7D-4317-A035-1B27AD10B0B8}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/> <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{E66AEAAE-74EA-4AAC-829A-61A0F319FC7C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/> <ROW Component="Microsoft.SqlServer.AzureStorageEnum.dll" ComponentId="{FD46373D-3E40-48AE-BD1B-6D32793D8A97}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.AzureStorageEnum.dll"/> @@ -135,6 +140,7 @@ <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{C23DD172-ACE0-4811-90D6-0C2F38B2C27E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/> <ROW Component="System.Reactive.Linq.dll" ComponentId="{572F229C-22E6-4934-BDB9-68600F354F67}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/> <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{84B191EA-72B0-4FA8-B352-AEF6BBD48F31}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/> + <ROW Component="System.Spatial.dll" ComponentId="{6B861A2B-6C7E-4C33-8D0C-66B61FF127B0}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/> <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{9F1DD6B2-3514-4C62-AACA-EE7368ECB36B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/> <ROW Component="System.Web.Http.dll" ComponentId="{0ABCDC64-DE4A-4994-B4C8-3B0146F68F09}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/> <ROW Component="System.Web.Razor.dll" ComponentId="{231E534C-FAF8-41DD-A21F-B5CACF6AB05F}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Razor.dll"/> @@ -171,6 +177,7 @@ <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.PDF.dll" ComponentId="{57AB06ED-B940-4CD4-91B6-DDC88E6EC0F6}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PDF.dll"/> <ROW Component="Tango.PMR.dll" ComponentId="{DF42D887-D9F9-44A1-95A3-605A057E66DF}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PMR.dll"/> <ROW Component="Tango.PPC.BackupRestore.dll" ComponentId="{7381AD19-7C23-41BB-ADC9-E2E845C2016C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.BackupRestore.dll"/> <ROW Component="Tango.PPC.BootScreen.exe" ComponentId="{CA4C7C72-D47B-4A35-8287-222F7CCEF05E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.BootScreen.exe"/> @@ -485,6 +492,14 @@ <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"/> + <ROW File="HiraokaHyperTools.PdfSharpWPF.dll" Component_="HiraokaHyperTools.PdfSharpWPF.dll" FileName="HIRAOK~1.DLL|HiraokaHyperTools.PdfSharp-WPF.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\HiraokaHyperTools.PdfSharp-WPF.dll" SelfReg="false"/> + <ROW File="HiraokaHyperTools.PdfSharp.Xps.dll" Component_="HiraokaHyperTools.PdfSharp.Xps.dll" FileName="HIRAOK~2.DLL|HiraokaHyperTools.PdfSharp.Xps.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\HiraokaHyperTools.PdfSharp.Xps.dll" SelfReg="false"/> + <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~5.DLL|Microsoft.Data.Edm.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Edm.dll" SelfReg="false"/> + <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICROS~6.DLL|Microsoft.Data.OData.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.OData.dll" SelfReg="false"/> + <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICROS~7.DLL|Microsoft.Data.Services.Client.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\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\PPC\Release\System.Spatial.dll" SelfReg="false"/> + <ROW File="Tango.PDF.dll" Component_="Tango.PDF.dll" FileName="TANGO~17.DLL|Tango.PDF.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PDF.dll" SelfReg="false"/> + <ROW File="Tango.PDF.pdb" Component_="Tango.PDF.dll" FileName="TANGO~18.PDB|Tango.PDF.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PDF.pdb" SelfReg="false"/> <ATTRIBUTE name="DontAddFileAttributes" value="true"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent"> @@ -494,7 +509,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.7.5" 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.5"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.7.6" 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.6"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> @@ -764,6 +779,13 @@ <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta"/> <ROW Feature_="MainFeature" Component_="turbojpeg.dll_1"/> <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta_1"/> + <ROW Feature_="MainFeature" Component_="HiraokaHyperTools.PdfSharpWPF.dll"/> + <ROW Feature_="MainFeature" Component_="HiraokaHyperTools.PdfSharp.Xps.dll"/> + <ROW Feature_="MainFeature" Component_="Microsoft.Data.Edm.dll"/> + <ROW Feature_="MainFeature" Component_="Microsoft.Data.OData.dll"/> + <ROW Feature_="MainFeature" Component_="Microsoft.Data.Services.Client.dll"/> + <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/> + <ROW Feature_="MainFeature" Component_="Tango.PDF.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/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index fa0bc594d..140555959 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.7.5.0")] +[assembly: AssemblyVersion("1.7.6.0")] |