diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-13 15:39:40 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-14 11:12:31 -0500 |
commit | d5985a1688bc878e42ffd3ce3939fa52303cab16 (patch) | |
tree | 0c283fe5454659c569317b37840a040474cfa032 /src/ext/Bal/wixext/Symbols | |
parent | 6a6974a15deb6edf593736cdb8043bfb93064782 (diff) | |
download | wix-d5985a1688bc878e42ffd3ce3939fa52303cab16.tar.gz wix-d5985a1688bc878e42ffd3ce3939fa52303cab16.tar.bz2 wix-d5985a1688bc878e42ffd3ce3939fa52303cab16.zip |
Add option to hosts to always install prereqs.
Add PrereqPackage to BundlePackage
Implements 4718
Diffstat (limited to 'src/ext/Bal/wixext/Symbols')
-rw-r--r-- | src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs | 5 | ||||
-rw-r--r-- | src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs | 47 |
2 files changed, 52 insertions, 0 deletions
diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs index 90865621..9010ce2d 100644 --- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs +++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs | |||
@@ -16,6 +16,7 @@ namespace WixToolset.Bal | |||
16 | WixMbaPrereqInformation, | 16 | WixMbaPrereqInformation, |
17 | WixStdbaOptions, | 17 | WixStdbaOptions, |
18 | WixStdbaOverridableVariable, | 18 | WixStdbaOverridableVariable, |
19 | WixMbaPrereqOptions, | ||
19 | } | 20 | } |
20 | 21 | ||
21 | public static partial class BalSymbolDefinitions | 22 | public static partial class BalSymbolDefinitions |
@@ -60,6 +61,9 @@ namespace WixToolset.Bal | |||
60 | case BalSymbolDefinitionType.WixStdbaOverridableVariable: | 61 | case BalSymbolDefinitionType.WixStdbaOverridableVariable: |
61 | return BalSymbolDefinitions.WixStdbaOverridableVariable; | 62 | return BalSymbolDefinitions.WixStdbaOverridableVariable; |
62 | 63 | ||
64 | case BalSymbolDefinitionType.WixMbaPrereqOptions: | ||
65 | return BalSymbolDefinitions.WixMbaPrereqOptions; | ||
66 | |||
63 | default: | 67 | default: |
64 | throw new ArgumentOutOfRangeException(nameof(type)); | 68 | throw new ArgumentOutOfRangeException(nameof(type)); |
65 | } | 69 | } |
@@ -75,6 +79,7 @@ namespace WixToolset.Bal | |||
75 | WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 79 | WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
76 | WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 80 | WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
77 | WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 81 | WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
82 | WixMbaPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | ||
78 | } | 83 | } |
79 | } | 84 | } |
80 | } | 85 | } |
diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs new file mode 100644 index 00000000..66374579 --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs | |||
@@ -0,0 +1,47 @@ | |||
1 | // 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. | ||
2 | |||
3 | namespace WixToolset.Bal | ||
4 | { | ||
5 | using WixToolset.Data; | ||
6 | using WixToolset.Bal.Symbols; | ||
7 | |||
8 | public static partial class BalSymbolDefinitions | ||
9 | { | ||
10 | public static readonly IntermediateSymbolDefinition WixMbaPrereqOptions = new IntermediateSymbolDefinition( | ||
11 | BalSymbolDefinitionType.WixMbaPrereqOptions.ToString(), | ||
12 | new[] | ||
13 | { | ||
14 | new IntermediateFieldDefinition(nameof(WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs), IntermediateFieldType.Number), | ||
15 | }, | ||
16 | typeof(WixMbaPrereqOptionsSymbol)); | ||
17 | } | ||
18 | } | ||
19 | |||
20 | namespace WixToolset.Bal.Symbols | ||
21 | { | ||
22 | using WixToolset.Data; | ||
23 | |||
24 | public enum WixMbaPrereqOptionsSymbolFields | ||
25 | { | ||
26 | AlwaysInstallPrereqs, | ||
27 | } | ||
28 | |||
29 | public class WixMbaPrereqOptionsSymbol : IntermediateSymbol | ||
30 | { | ||
31 | public WixMbaPrereqOptionsSymbol() : base(BalSymbolDefinitions.WixMbaPrereqOptions, null, null) | ||
32 | { | ||
33 | } | ||
34 | |||
35 | public WixMbaPrereqOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqOptions, sourceLineNumber, id) | ||
36 | { | ||
37 | } | ||
38 | |||
39 | public IntermediateField this[WixMbaPrereqOptionsSymbolFields index] => this.Fields[(int)index]; | ||
40 | |||
41 | public int AlwaysInstallPrereqs | ||
42 | { | ||
43 | get => this.Fields[(int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs].AsNumber(); | ||
44 | set => this.Set((int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs, value); | ||
45 | } | ||
46 | } | ||
47 | } | ||