diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-25 15:36:31 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-25 23:06:35 -0500 |
| commit | b4210b23ea28e0acc5a8b7ca5357d7d3926071b4 (patch) | |
| tree | 89f476f9469682691e771cf204e04f007d6cfebd /src/WixToolset.Core/Compile/CompilerPayload.cs | |
| parent | 8b7545c2b692098957cc5737e92415bbe4f7823d (diff) | |
| download | wix-b4210b23ea28e0acc5a8b7ca5357d7d3926071b4.tar.gz wix-b4210b23ea28e0acc5a8b7ca5357d7d3926071b4.tar.bz2 wix-b4210b23ea28e0acc5a8b7ca5357d7d3926071b4.zip | |
Allow DownloadUrl on embedded payloads.
#5253
Diffstat (limited to 'src/WixToolset.Core/Compile/CompilerPayload.cs')
| -rw-r--r-- | src/WixToolset.Core/Compile/CompilerPayload.cs | 11 |
1 files changed, 2 insertions, 9 deletions
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 | |||
| 15 | 15 | ||
| 16 | public string Description { get; set; } | 16 | public string Description { get; set; } |
| 17 | 17 | ||
| 18 | public string DisplayName { get; set; } | ||
| 19 | |||
| 20 | public string DownloadUrl { get; set; } | 18 | public string DownloadUrl { get; set; } |
| 21 | 19 | ||
| 22 | public string Hash { get; set; } | 20 | public string Hash { get; set; } |
| @@ -158,7 +156,7 @@ namespace WixToolset.Core | |||
| 158 | 156 | ||
| 159 | if (!String.IsNullOrEmpty(this.DownloadUrl)) | 157 | if (!String.IsNullOrEmpty(this.DownloadUrl)) |
| 160 | { | 158 | { |
| 161 | this.Core.Write(WarningMessages.DownloadUrlNotSupportedForEmbeddedPayloads(this.SourceLineNumbers, this.Id.Id)); | 159 | this.Core.Write(WarningMessages.DownloadUrlNotSupportedForBAPayloads(this.SourceLineNumbers, this.Id.Id)); |
| 162 | } | 160 | } |
| 163 | 161 | ||
| 164 | this.Compressed = YesNoDefaultType.Yes; | 162 | this.Compressed = YesNoDefaultType.Yes; |
| @@ -174,7 +172,7 @@ namespace WixToolset.Core | |||
| 174 | DownloadUrl = this.DownloadUrl, | 172 | DownloadUrl = this.DownloadUrl, |
| 175 | Compressed = (this.Compressed == YesNoDefaultType.Yes) ? true : (this.Compressed == YesNoDefaultType.No) ? (bool?)false : null, | 173 | Compressed = (this.Compressed == YesNoDefaultType.Yes) ? true : (this.Compressed == YesNoDefaultType.No) ? (bool?)false : null, |
| 176 | UnresolvedSourceFile = this.SourceFile, // duplicate of sourceFile but in a string column so it won't get resolved to a full path during binding. | 174 | UnresolvedSourceFile = this.SourceFile, // duplicate of sourceFile but in a string column so it won't get resolved to a full path during binding. |
| 177 | DisplayName = this.DisplayName ?? this.ProductName, | 175 | DisplayName = this.ProductName, |
| 178 | Description = this.Description, | 176 | Description = this.Description, |
| 179 | Hash = this.Hash, | 177 | Hash = this.Hash, |
| 180 | FileSize = this.Size, | 178 | FileSize = this.Size, |
| @@ -245,11 +243,6 @@ namespace WixToolset.Core | |||
| 245 | this.Description = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); | 243 | this.Description = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); |
| 246 | } | 244 | } |
| 247 | 245 | ||
| 248 | public void ParseDisplayName(XAttribute attrib) | ||
| 249 | { | ||
| 250 | this.DisplayName = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); | ||
| 251 | } | ||
| 252 | |||
| 253 | public void ParseDownloadUrl(XAttribute attrib) | 246 | public void ParseDownloadUrl(XAttribute attrib) |
| 254 | { | 247 | { |
| 255 | this.DownloadUrl = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); | 248 | this.DownloadUrl = this.Core.GetAttributeValue(this.SourceLineNumbers, attrib); |
