From e51932ea0bac331b128dba9809f00c7d393c7a9b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 25 Apr 2021 15:38:03 -0500 Subject: Enable better bundle validation. --- src/WixToolset.Data/Burn/BurnConstants.cs | 2 ++ src/WixToolset.Data/ComplexReferenceChildType.cs | 3 +++ src/WixToolset.Data/WarningMessages.cs | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Data/Burn/BurnConstants.cs b/src/WixToolset.Data/Burn/BurnConstants.cs index 65bfb4df..484b144d 100644 --- a/src/WixToolset.Data/Burn/BurnConstants.cs +++ b/src/WixToolset.Data/Burn/BurnConstants.cs @@ -6,6 +6,8 @@ namespace WixToolset.Data.Burn { public const string BurnUXContainerName = "WixUXContainer"; public const string BurnDefaultAttachedContainerName = "WixAttachedContainer"; + public const string BundleChainPackageGroupId = "WixChain"; + public const string BundleDefaultBoundaryId = "WixDefaultBoundary"; public const string BundleLayoutOnlyPayloadsName = "BundleLayoutOnlyPayloads"; public const string BurnManifestWixOutputStreamName = "wix-burndata.xml"; diff --git a/src/WixToolset.Data/ComplexReferenceChildType.cs b/src/WixToolset.Data/ComplexReferenceChildType.cs index 62e233b6..a5d4e7ac 100644 --- a/src/WixToolset.Data/ComplexReferenceChildType.cs +++ b/src/WixToolset.Data/ComplexReferenceChildType.cs @@ -45,5 +45,8 @@ namespace WixToolset.Data /// PatchFamilyGroup child of complex reference. PatchFamilyGroup, + + /// ContainerPackage child of complex reference. + ContainerPackage, } } diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs index cf8fdfd9..78ed87af 100644 --- a/src/WixToolset.Data/WarningMessages.cs +++ b/src/WixToolset.Data/WarningMessages.cs @@ -237,9 +237,9 @@ namespace WixToolset.Data return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForAttachedContainers, "The Container '{0}' is attached but included a @DownloadUrl attribute. Attached Containers cannot be downloaded so the download URL is being ignored.", containerId); } - public static Message DownloadUrlNotSupportedForEmbeddedPayloads(SourceLineNumber sourceLineNumbers, string payloadId) + public static Message DownloadUrlNotSupportedForBAPayloads(SourceLineNumber sourceLineNumbers, string payloadId) { - return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForEmbeddedPayloads, "The Payload '{0}' is embedded but included a @DownloadUrl attribute. Embedded Payloads cannot be downloaded so the download URL is being ignored.", payloadId); + return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForBAPayloads, "The BootstrapperApplication Payload '{0}' included a @DownloadUrl attribute. BootstrapperApplication Payloads cannot be downloaded so the download URL is being ignored.", payloadId); } public static Message DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath) @@ -785,7 +785,7 @@ namespace WixToolset.Data DiscardedRollbackBoundary = 1129, DeprecatedElement = 1130, CannotUpdateCabCache = 1131, - DownloadUrlNotSupportedForEmbeddedPayloads = 1132, + DownloadUrlNotSupportedForBAPayloads = 1132, DiscouragedAllUsersValue = 1133, ImplicitlyPerUser = 1134, PerUserButForcingPerMachine = 1135, -- cgit v1.2.3-55-g6feb