From a482589448fb6e0f7abc1c725c49c65344c83509 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 5 Feb 2020 14:41:10 -0800 Subject: Fix patch related tuples --- src/WixToolset.Data/ErrorMessages.cs | 6 ++++ .../Tuples/SummaryInformationTuple.cs | 33 +++++++++++++++++++++- .../Tuples/WixPatchBaselineTuple.cs | 24 ++++++++++++++++ src/WixToolset.Data/Tuples/WixPatchIdTuple.cs | 8 ------ .../Tuples/WixPatchMetadataTuple.cs | 10 ++----- 5 files changed, 64 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs index 3fa23a74..43398ad2 100644 --- a/src/WixToolset.Data/ErrorMessages.cs +++ b/src/WixToolset.Data/ErrorMessages.cs @@ -203,6 +203,11 @@ namespace WixToolset.Data return Message(null, Ids.CorruptFileFormat, "Attempted to load corrupt file from path: {0}. The file with format {1} contained unexpected content. Ensure the correct path was provided and that the file has not been incorrectly modified.", path, format.ToLowerInvariant()); } + public static Message CouldNotDetermineProductCodeFromTransformSummaryInfo() + { + return Message(null, Ids.CouldNotDetermineProductCodeFromTransformSummaryInfo, "Could not determine ProductCode from transform summary information."); + } + public static Message CreateCabAddFileFailed() { return Message(null, Ids.CreateCabAddFileFailed, "An error (E_FAIL) was returned while adding files to a CAB file. This most commonly happens when creating a CAB file 2 GB or larger. Either reduce the size of your installation package, raise Media/@CompressionLevel to a higher compression level, or split your installation package's files into more than one CAB file."); @@ -2640,6 +2645,7 @@ namespace WixToolset.Data NoSourceFiles = 391, WixiplSourceFileIsExclusive = 392, UnableToConvertFieldToNumber = 393, + CouldNotDetermineProductCodeFromTransformSummaryInfo = 394, } } } diff --git a/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs b/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs index a67f1985..074c2bb1 100644 --- a/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs +++ b/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs @@ -30,20 +30,51 @@ namespace WixToolset.Data.Tuples Codepage = 1, Title, Subject, + PatchPackageName = 3, //used by patches Author, Keywords, Comments, PlatformAndLanguage, + PatchProductCodes = 7, // used by patches TransformPlatformAndLanguageOrStorageNames, + TransformNames = 8, // used by patches PackageCode, - Created = 12, + PatchCode = 9, // used by patches + TransformProductCodes = 9, // used by transforms + Reserved11 = 11, // reserved by patches + Created, LastSaved, WindowsInstallerVersion, + Reserved14 = 14, // reserved by patches WordCount, + PatchInstallerRequirement = 15, // used by patches + Reserved16, // reserved by patches + TransformValidationFlags = 16, // used by transforms CreatingApplication = 18, Security } + /// + /// Summary information values for the PachInstallerRequirement property. + /// + public enum PatchInstallerRequirement + { + /// Any version of the installer will do + Version10 = 1, + + /// At least 1.2 + Version12 = 2, + + /// At least 2.0 + Version20 = 3, + + /// At least 3.0 + Version30 = 4, + + /// At least 3.1 + Version31 = 5, + } + public class SummaryInformationTuple : IntermediateTuple { public SummaryInformationTuple() : base(TupleDefinitions.SummaryInformation, null, null) diff --git a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs index f5b6dba0..7358e66e 100644 --- a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs +++ b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs @@ -12,6 +12,9 @@ namespace WixToolset.Data { new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.DiskId), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.ValidationFlags), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.BaselineFile), IntermediateFieldType.Path), + new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.UpdateFile), IntermediateFieldType.Path), + new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.TransformFile), IntermediateFieldType.Path), }, typeof(WixPatchBaselineTuple)); } @@ -23,6 +26,9 @@ namespace WixToolset.Data.Tuples { DiskId, ValidationFlags, + BaselineFile, + UpdateFile, + TransformFile, } public class WixPatchBaselineTuple : IntermediateTuple @@ -48,5 +54,23 @@ namespace WixToolset.Data.Tuples get => (TransformFlags)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags].AsNumber(); set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, (int)value); } + + public IntermediateFieldPathValue BaselineFile + { + get => this.Fields[(int)WixPatchBaselineTupleFields.BaselineFile].AsPath(); + set => this.Set((int)WixPatchBaselineTupleFields.BaselineFile, value); + } + + public IntermediateFieldPathValue UpdateFile + { + get => this.Fields[(int)WixPatchBaselineTupleFields.UpdateFile].AsPath(); + set => this.Set((int)WixPatchBaselineTupleFields.UpdateFile, value); + } + + public IntermediateFieldPathValue TransformFile + { + get => this.Fields[(int)WixPatchBaselineTupleFields.TransformFile].AsPath(); + set => this.Set((int)WixPatchBaselineTupleFields.TransformFile, value); + } } } diff --git a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs index 303ccecd..35c99493 100644 --- a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs +++ b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs @@ -10,7 +10,6 @@ namespace WixToolset.Data TupleDefinitionType.WixPatchId, new[] { - new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ProductCode), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ClientPatchId), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Bool), new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number), @@ -23,7 +22,6 @@ namespace WixToolset.Data.Tuples { public enum WixPatchIdTupleFields { - ProductCode, ClientPatchId, OptimizePatchSizeForLargeFiles, ApiPatchingSymbolFlags, @@ -41,12 +39,6 @@ namespace WixToolset.Data.Tuples public IntermediateField this[WixPatchIdTupleFields index] => this.Fields[(int)index]; - public string ProductCode - { - get => (string)this.Fields[(int)WixPatchIdTupleFields.ProductCode]; - set => this.Set((int)WixPatchIdTupleFields.ProductCode, value); - } - public string ClientPatchId { get => (string)this.Fields[(int)WixPatchIdTupleFields.ClientPatchId]; diff --git a/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs index 7c065fe8..b64fd891 100644 --- a/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs +++ b/src/WixToolset.Data/Tuples/WixPatchMetadataTuple.cs @@ -1,5 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +// TODO: delete this + namespace WixToolset.Data { using WixToolset.Data.Tuples; @@ -10,7 +12,6 @@ namespace WixToolset.Data TupleDefinitionType.WixPatchMetadata, new[] { - new IntermediateFieldDefinition(nameof(WixPatchMetadataTupleFields.Property), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixPatchMetadataTupleFields.Value), IntermediateFieldType.String), }, typeof(WixPatchMetadataTuple)); @@ -21,7 +22,6 @@ namespace WixToolset.Data.Tuples { public enum WixPatchMetadataTupleFields { - Property, Value, } @@ -37,12 +37,6 @@ namespace WixToolset.Data.Tuples public IntermediateField this[WixPatchMetadataTupleFields index] => this.Fields[(int)index]; - public string Property - { - get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Property]; - set => this.Set((int)WixPatchMetadataTupleFields.Property, value); - } - public string Value { get => (string)this.Fields[(int)WixPatchMetadataTupleFields.Value]; -- cgit v1.2.3-55-g6feb