From 3704a5547766581b15690b6535d03568afcfc2a0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 13 Apr 2022 10:14:16 -0500 Subject: Change harvested symbols to ref the package payload for remote support. --- .../WixToolset.Data/Symbols/SymbolDefinitions.cs | 4 + .../WixBundleHarvestedDependencyProviderSymbol.cs | 93 ++++++++++++++++++++++ .../Symbols/WixBundleMsiFeatureSymbol.cs | 10 +-- .../Symbols/WixBundlePackageRelatedBundleSymbol.cs | 10 +-- .../Symbols/WixBundlePatchTargetCodeSymbol.cs | 10 +-- .../Symbols/WixBundleRelatedPackageSymbol.cs | 10 +-- 6 files changed, 117 insertions(+), 20 deletions(-) create mode 100644 src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedDependencyProviderSymbol.cs (limited to 'src/api') diff --git a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs index 3e0ec512..4a3269c5 100644 --- a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs +++ b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs @@ -131,6 +131,7 @@ namespace WixToolset.Data WixBundleExePackagePayload, WixBundleExtension, WixBundleHarvestedBundlePackage, + WixBundleHarvestedDependencyProvider, WixBundleHarvestedMsiPackage, WixBundleHarvestedMspPackage, WixBundleMsiFeature, @@ -589,6 +590,9 @@ namespace WixToolset.Data case SymbolDefinitionType.WixBundleHarvestedBundlePackage: return SymbolDefinitions.WixBundleHarvestedBundlePackage; + case SymbolDefinitionType.WixBundleHarvestedDependencyProvider: + return SymbolDefinitions.WixBundleHarvestedDependencyProvider; + case SymbolDefinitionType.WixBundleHarvestedMsiPackage: return SymbolDefinitions.WixBundleHarvestedMsiPackage; diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedDependencyProviderSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedDependencyProviderSymbol.cs new file mode 100644 index 00000000..71d77c94 --- /dev/null +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedDependencyProviderSymbol.cs @@ -0,0 +1,93 @@ +// 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. + +namespace WixToolset.Data +{ + using WixToolset.Data.Symbols; + + public static partial class SymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBundleHarvestedDependencyProvider = new IntermediateSymbolDefinition( + SymbolDefinitionType.WixBundleHarvestedDependencyProvider, + new[] + { + new IntermediateFieldDefinition(nameof(WixBundleHarvestedDependencyProviderSymbolFields.PackagePayloadRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundleHarvestedDependencyProviderSymbolFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixBundleHarvestedDependencyProviderSymbolFields.ProviderKey), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundleHarvestedDependencyProviderSymbolFields.Version), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundleHarvestedDependencyProviderSymbolFields.DisplayName), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundleHarvestedDependencyProviderSymbolFields.ProviderAttributes), IntermediateFieldType.Number), + }, + typeof(WixDependencyProviderSymbol)); + } +} + +namespace WixToolset.Data.Symbols +{ + using System; + using WixToolset.Data; + + public enum WixBundleHarvestedDependencyProviderSymbolFields + { + PackagePayloadRef, + Attributes, + ProviderKey, + Version, + DisplayName, + ProviderAttributes, + } + + [Flags] + public enum WixBundleHarvestedDependencyProviderAttributes + { + None = 0x0, + } + + public class WixBundleHarvestedDependencyProviderSymbol : IntermediateSymbol + { + public WixBundleHarvestedDependencyProviderSymbol() : base(SymbolDefinitions.WixBundleHarvestedDependencyProvider, null, null) + { + } + + public WixBundleHarvestedDependencyProviderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleHarvestedDependencyProvider, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBundleHarvestedDependencyProviderSymbolFields index] => this.Fields[(int)index]; + + public string PackagePayloadRef + { + get => this.Fields[(int)WixBundleHarvestedDependencyProviderSymbolFields.PackagePayloadRef].AsString(); + set => this.Set((int)WixBundleHarvestedDependencyProviderSymbolFields.PackagePayloadRef, value); + } + + public WixBundleHarvestedDependencyProviderAttributes Attributes + { + get => (WixBundleHarvestedDependencyProviderAttributes)this.Fields[(int)WixBundleHarvestedDependencyProviderSymbolFields.Attributes].AsNumber(); + set => this.Set((int)WixBundleHarvestedDependencyProviderSymbolFields.Attributes, (int)value); + } + + public string ProviderKey + { + get => this.Fields[(int)WixBundleHarvestedDependencyProviderSymbolFields.ProviderKey].AsString(); + set => this.Set((int)WixBundleHarvestedDependencyProviderSymbolFields.ProviderKey, value); + } + + public string Version + { + get => this.Fields[(int)WixBundleHarvestedDependencyProviderSymbolFields.Version].AsString(); + set => this.Set((int)WixBundleHarvestedDependencyProviderSymbolFields.Version, value); + } + + public string DisplayName + { + get => this.Fields[(int)WixBundleHarvestedDependencyProviderSymbolFields.DisplayName].AsString(); + set => this.Set((int)WixBundleHarvestedDependencyProviderSymbolFields.DisplayName, value); + } + + public int ProviderAttributes + { + get => this.Fields[(int)WixBundleHarvestedDependencyProviderSymbolFields.ProviderAttributes].AsNumber(); + set => this.Set((int)WixBundleHarvestedDependencyProviderSymbolFields.ProviderAttributes, value); + } + } +} diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleMsiFeatureSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleMsiFeatureSymbol.cs index 829e81c0..86ebdeb8 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixBundleMsiFeatureSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleMsiFeatureSymbol.cs @@ -10,7 +10,7 @@ namespace WixToolset.Data SymbolDefinitionType.WixBundleMsiFeature, new[] { - new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.PackageRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.PackagePayloadRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Name), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Size), IntermediateFieldType.LargeNumber), new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Parent), IntermediateFieldType.String), @@ -29,7 +29,7 @@ namespace WixToolset.Data.Symbols { public enum WixBundleMsiFeatureSymbolFields { - PackageRef, + PackagePayloadRef, Name, Size, Parent, @@ -53,10 +53,10 @@ namespace WixToolset.Data.Symbols public IntermediateField this[WixBundleMsiFeatureSymbolFields index] => this.Fields[(int)index]; - public string PackageRef + public string PackagePayloadRef { - get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.PackageRef]; - set => this.Set((int)WixBundleMsiFeatureSymbolFields.PackageRef, value); + get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.PackagePayloadRef]; + set => this.Set((int)WixBundleMsiFeatureSymbolFields.PackagePayloadRef, value); } public string Name diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs index dfb48714..31f4f713 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs @@ -10,7 +10,7 @@ namespace WixToolset.Data SymbolDefinitionType.WixBundlePackageRelatedBundle, new[] { - new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.PackageRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.Action), IntermediateFieldType.Number), }, @@ -22,7 +22,7 @@ namespace WixToolset.Data.Symbols { public enum WixBundlePackageRelatedBundleSymbolFields { - PackageRef, + PackagePayloadRef, BundleId, Action, } @@ -39,10 +39,10 @@ namespace WixToolset.Data.Symbols public IntermediateField this[WixBundlePackageRelatedBundleSymbolFields index] => this.Fields[(int)index]; - public string PackageRef + public string PackagePayloadRef { - get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.PackageRef]; - set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.PackageRef, value); + get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef]; + set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef, value); } public string BundleId diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePatchTargetCodeSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePatchTargetCodeSymbol.cs index 85f50602..37b5bfa9 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePatchTargetCodeSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePatchTargetCodeSymbol.cs @@ -10,7 +10,7 @@ namespace WixToolset.Data SymbolDefinitionType.WixBundlePatchTargetCode, new[] { - new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.PackageRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.PackagePayloadRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.TargetCode), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.Attributes), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.Type), IntermediateFieldType.Number), @@ -25,7 +25,7 @@ namespace WixToolset.Data.Symbols public enum WixBundlePatchTargetCodeSymbolFields { - PackageRef, + PackagePayloadRef, TargetCode, Attributes, Type, @@ -67,10 +67,10 @@ namespace WixToolset.Data.Symbols public IntermediateField this[WixBundlePatchTargetCodeSymbolFields index] => this.Fields[(int)index]; - public string PackageRef + public string PackagePayloadRef { - get => (string)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.PackageRef]; - set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.PackageRef, value); + get => (string)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.PackagePayloadRef]; + set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.PackagePayloadRef, value); } public string TargetCode diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleRelatedPackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleRelatedPackageSymbol.cs index 77789048..d809e09d 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixBundleRelatedPackageSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleRelatedPackageSymbol.cs @@ -10,7 +10,7 @@ namespace WixToolset.Data SymbolDefinitionType.WixBundleRelatedPackage, new[] { - new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.PackageRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.PackagePayloadRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.RelatedId), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.MinVersion), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.MaxVersion), IntermediateFieldType.String), @@ -27,7 +27,7 @@ namespace WixToolset.Data.Symbols public enum WixBundleRelatedPackageSymbolFields { - PackageRef, + PackagePayloadRef, RelatedId, MinVersion, MaxVersion, @@ -57,10 +57,10 @@ namespace WixToolset.Data.Symbols public IntermediateField this[WixBundleRelatedPackageSymbolFields index] => this.Fields[(int)index]; - public string PackageRef + public string PackagePayloadRef { - get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.PackageRef]; - set => this.Set((int)WixBundleRelatedPackageSymbolFields.PackageRef, value); + get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.PackagePayloadRef]; + set => this.Set((int)WixBundleRelatedPackageSymbolFields.PackagePayloadRef, value); } public string RelatedId -- cgit v1.2.3-55-g6feb