From 3261d8d93365d866f5323b7806837655f1e5e084 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 7 Dec 2020 19:38:16 -0600 Subject: Require SourceFile for BundleExtension. --- src/WixToolset.Core/Compiler_Bundle.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index ec377a46..68b738fb 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs @@ -1122,7 +1122,7 @@ namespace WixToolset.Core var previousType = ComplexReferenceChildType.Unknown; // The BundleExtension element acts like a Payload element so delegate to the "Payload" attribute parsing code to parse and create a Payload entry. - if (this.ParsePayloadElementContent(node, ComplexReferenceParentType.Container, Compiler.BurnUXContainerId, previousType, previousId, false, out var id)) + if (this.ParsePayloadElementContent(node, ComplexReferenceParentType.Container, Compiler.BurnUXContainerId, previousType, previousId, true, out var id)) { previousId = id; previousType = ComplexReferenceChildType.Payload; @@ -1153,19 +1153,6 @@ namespace WixToolset.Core } } - if (null == previousId) - { - // We need *either* or or even just @SourceFile on the BundleExtension... - // but we just say there's a missing . - // TODO: Is there a better message for this? - this.Core.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, node.Name.LocalName, "Payload")); - } - - if (null == id) - { - this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); - } - // Add the BundleExtension. if (!this.Core.EncounteredError) { -- cgit v1.2.3-55-g6feb