From b4210b23ea28e0acc5a8b7ca5357d7d3926071b4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 25 Apr 2021 15:36:31 -0500 Subject: Allow DownloadUrl on embedded payloads. #5253 --- src/WixToolset.Core/Compile/CompilerPayload.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/WixToolset.Core/Compile') diff --git a/src/WixToolset.Core/Compile/CompilerPayload.cs b/src/WixToolset.Core/Compile/CompilerPayload.cs index 4c7e843d..3f423034 100644 --- a/src/WixToolset.Core/Compile/CompilerPayload.cs +++ b/src/WixToolset.Core/Compile/CompilerPayload.cs @@ -15,8 +15,6 @@ namespace WixToolset.Core public string Description { get; set; } - public string DisplayName { get; set; } - public string DownloadUrl { get; set; } public string Hash { get; set; } @@ -158,7 +156,7 @@ namespace WixToolset.Core if (!String.IsNullOrEmpty(this.DownloadUrl)) { - this.Core.Write(WarningMessages.DownloadUrlNotSupportedForEmbeddedPayloads(this.SourceLineNumbers, this.Id.Id)); + this.Core.Write(WarningMessages.DownloadUrlNotSupportedForBAPayloads(this.SourceLineNumbers, this.Id.Id)); } this.Compressed = YesNoDefaultType.Yes; @@ -174,7 +172,7 @@ namespace WixToolset.Core DownloadUrl = this.DownloadUrl, Compressed = (this.Compressed == YesNoDefaultType.Yes) ? true : (this.Compressed == YesNoDefaultType.No) ? (bool?)false : null, UnresolvedSourceFile = this.SourceFile, // duplicate of sourceFile but in a string column so it won't get resolved to a full path during binding. - DisplayName = this.DisplayName ?? this.ProductName, + DisplayName = this.ProductName, Description = this.Description, Hash = this.Hash, FileSize = this.Size, @@ -245,11 +243,6 @@ namespace WixToolset.Core this.Description = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); } - public void ParseDisplayName(XAttribute attrib) - { - this.DisplayName = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); - } - public void ParseDownloadUrl(XAttribute attrib) { this.DownloadUrl = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); -- cgit v1.2.3-55-g6feb