From aacd6b677332f2e262d0df67603c246cd65d833e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 1 Aug 2022 17:07:25 -0500 Subject: 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'. --- src/api/wix/WixToolset.Data/Burn/BurnConstants.cs | 7 ------- .../WixToolset.Data/Symbols/WixBundleVariableSymbol.cs | 17 ----------------- 2 files changed, 24 deletions(-) (limited to 'src/api') 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 public const string BootstrapperApplicationDataSymbolDefinitionTag = "WixBootstrapperApplicationData"; public const string BundleExtensionSearchSymbolDefinitionTag = "WixBundleExtensionSearch"; - - // The following constants must stay in sync with src\burn\engine\core.h - public const string BURN_BUNDLE_INPROGRESS_NAME = "WixBundleInProgressName"; - public const string BURN_BUNDLE_NAME = "WixBundleName"; - public const string BURN_BUNDLE_ORIGINAL_SOURCE = "WixBundleOriginalSource"; - public const string BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER = "WixBundleOriginalSourceFolder"; - public const string BURN_BUNDLE_LAST_USED_SOURCE = "WixBundleLastUsedSource"; } } 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 None = 0x0, Hidden = 0x1, Persisted = 0x2, - BuiltIn = 0x4, } public enum WixBundleVariableType @@ -108,21 +107,5 @@ namespace WixToolset.Data.Symbols } } } - - public bool BuiltIn - { - get { return this.Attributes.HasFlag(WixBundleVariableAttributes.BuiltIn); } - set - { - if (value) - { - this.Attributes |= WixBundleVariableAttributes.BuiltIn; - } - else - { - this.Attributes &= ~WixBundleVariableAttributes.BuiltIn; - } - } - } } } -- cgit v1.2.3-55-g6feb