diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-08-01 17:07:25 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-08-02 09:15:14 -0500 |
commit | aacd6b677332f2e262d0df67603c246cd65d833e (patch) | |
tree | 05d4e5a127fc2b5feec6f74144bd195f337a8281 /src/api | |
parent | 457ef57f96c1706a63e8f848be3e07a58e7de6a3 (diff) | |
download | wix-aacd6b677332f2e262d0df67603c246cd65d833e.tar.gz wix-aacd6b677332f2e262d0df67603c246cd65d833e.tar.bz2 wix-aacd6b677332f2e262d0df67603c246cd65d833e.zip |
Store list of persisted well-known variables in Burn.
This allows it to reject Variables declared in the manifest that start with the reserved prefix 'Wix'.
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/wix/WixToolset.Data/Burn/BurnConstants.cs | 7 | ||||
-rw-r--r-- | src/api/wix/WixToolset.Data/Symbols/WixBundleVariableSymbol.cs | 17 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/api/wix/WixToolset.Data/Burn/BurnConstants.cs b/src/api/wix/WixToolset.Data/Burn/BurnConstants.cs index 8eeb030b..9e74827c 100644 --- a/src/api/wix/WixToolset.Data/Burn/BurnConstants.cs +++ b/src/api/wix/WixToolset.Data/Burn/BurnConstants.cs | |||
@@ -19,12 +19,5 @@ namespace WixToolset.Data.Burn | |||
19 | 19 | ||
20 | public const string BootstrapperApplicationDataSymbolDefinitionTag = "WixBootstrapperApplicationData"; | 20 | public const string BootstrapperApplicationDataSymbolDefinitionTag = "WixBootstrapperApplicationData"; |
21 | public const string BundleExtensionSearchSymbolDefinitionTag = "WixBundleExtensionSearch"; | 21 | public const string BundleExtensionSearchSymbolDefinitionTag = "WixBundleExtensionSearch"; |
22 | |||
23 | // The following constants must stay in sync with src\burn\engine\core.h | ||
24 | public const string BURN_BUNDLE_INPROGRESS_NAME = "WixBundleInProgressName"; | ||
25 | public const string BURN_BUNDLE_NAME = "WixBundleName"; | ||
26 | public const string BURN_BUNDLE_ORIGINAL_SOURCE = "WixBundleOriginalSource"; | ||
27 | public const string BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER = "WixBundleOriginalSourceFolder"; | ||
28 | public const string BURN_BUNDLE_LAST_USED_SOURCE = "WixBundleLastUsedSource"; | ||
29 | } | 22 | } |
30 | } | 23 | } |
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleVariableSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleVariableSymbol.cs index ea49da8d..b8a1923d 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixBundleVariableSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleVariableSymbol.cs | |||
@@ -35,7 +35,6 @@ namespace WixToolset.Data.Symbols | |||
35 | None = 0x0, | 35 | None = 0x0, |
36 | Hidden = 0x1, | 36 | Hidden = 0x1, |
37 | Persisted = 0x2, | 37 | Persisted = 0x2, |
38 | BuiltIn = 0x4, | ||
39 | } | 38 | } |
40 | 39 | ||
41 | public enum WixBundleVariableType | 40 | public enum WixBundleVariableType |
@@ -108,21 +107,5 @@ namespace WixToolset.Data.Symbols | |||
108 | } | 107 | } |
109 | } | 108 | } |
110 | } | 109 | } |
111 | |||
112 | public bool BuiltIn | ||
113 | { | ||
114 | get { return this.Attributes.HasFlag(WixBundleVariableAttributes.BuiltIn); } | ||
115 | set | ||
116 | { | ||
117 | if (value) | ||
118 | { | ||
119 | this.Attributes |= WixBundleVariableAttributes.BuiltIn; | ||
120 | } | ||
121 | else | ||
122 | { | ||
123 | this.Attributes &= ~WixBundleVariableAttributes.BuiltIn; | ||
124 | } | ||
125 | } | ||
126 | } | ||
127 | } | 110 | } |
128 | } | 111 | } |