aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-04-24 17:00:13 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-04-25 23:06:35 -0500
commit8a957275b6a1185f3b74fb31fff258be7f628347 (patch)
treee59e314117a837665b14cdb8aebbd107d55fc4e2 /src/WixToolset.Core
parent07bee0d033f1b4acb63e3da17764a3855503bce2 (diff)
downloadwix-8a957275b6a1185f3b74fb31fff258be7f628347.tar.gz
wix-8a957275b6a1185f3b74fb31fff258be7f628347.tar.bz2
wix-8a957275b6a1185f3b74fb31fff258be7f628347.zip
Ignore Compressed attribute for payloads when authored into a container
#6406
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs6
-rw-r--r--src/WixToolset.Core/LinkerWarnings.cs6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs b/src/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs
index 52734141..16593c7d 100644
--- a/src/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs
+++ b/src/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs
@@ -169,6 +169,12 @@ namespace WixToolset.Core.Link
169 169
170 if (String.IsNullOrEmpty(payloadSymbol.ContainerRef)) 170 if (String.IsNullOrEmpty(payloadSymbol.ContainerRef))
171 { 171 {
172 if (payloadSymbol.Compressed == false)
173 {
174 this.Messaging.Write(LinkerWarnings.UncompressedPayloadInContainer(payloadSymbol.SourceLineNumbers, groupSymbol.ChildId, containerId));
175 }
176
177 payloadSymbol.Compressed = true;
172 payloadSymbol.ContainerRef = containerId; 178 payloadSymbol.ContainerRef = containerId;
173 } 179 }
174 else 180 else
diff --git a/src/WixToolset.Core/LinkerWarnings.cs b/src/WixToolset.Core/LinkerWarnings.cs
index 0eca090e..968fa4ea 100644
--- a/src/WixToolset.Core/LinkerWarnings.cs
+++ b/src/WixToolset.Core/LinkerWarnings.cs
@@ -16,6 +16,11 @@ namespace WixToolset.Core
16 return Message(sourceLineNumbers, Ids.PayloadInMultipleContainers, "The Payload '{0}' can't be added to Container '{1}' because it was already added to Container '{2}'.", payloadId, containerId1, containerId2); 16 return Message(sourceLineNumbers, Ids.PayloadInMultipleContainers, "The Payload '{0}' can't be added to Container '{1}' because it was already added to Container '{2}'.", payloadId, containerId1, containerId2);
17 } 17 }
18 18
19 public static Message UncompressedPayloadInContainer(SourceLineNumber sourceLineNumbers, string payloadId, string containerId)
20 {
21 return Message(sourceLineNumbers, Ids.UncompressedPayloadInContainer, "The Payload '{0}' is being added to Container '{1}', overriding its Compressed value of 'no'.", payloadId, containerId);
22 }
23
19 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) 24 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
20 { 25 {
21 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); 26 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -25,6 +30,7 @@ namespace WixToolset.Core
25 { 30 {
26 LayoutPayloadInContainer = 6900, 31 LayoutPayloadInContainer = 6900,
27 PayloadInMultipleContainers = 6901, 32 PayloadInMultipleContainers = 6901,
33 UncompressedPayloadInContainer = 6902,
28 } // last available is 6999. 7000 is LinkerErrors. 34 } // last available is 6999. 7000 is LinkerErrors.
29 } 35 }
30} 36}