Enable better bundle validation.
Sean Hall committed
Apr 25, 2021 at 15:38 UTC
e51932ea0bac331b128dba9809f00c7d393c7a9b
3 files changed
+8
-3
src/WixToolset.Data/Burn/BurnConstants.cs
+2
@@ -6,6 +6,8 @@ namespace WixToolset.Data.Burn
6
{
7
public const string BurnUXContainerName = "WixUXContainer";
8
public const string BurnDefaultAttachedContainerName = "WixAttachedContainer";
9
+ public const string BundleChainPackageGroupId = "WixChain";
10
+ public const string BundleDefaultBoundaryId = "WixDefaultBoundary";
11
public const string BundleLayoutOnlyPayloadsName = "BundleLayoutOnlyPayloads";
12
13
public const string BurnManifestWixOutputStreamName = "wix-burndata.xml";
src/WixToolset.Data/ComplexReferenceChildType.cs
+3
@@ -45,5 +45,8 @@ namespace WixToolset.Data
45
46
/// <summary>PatchFamilyGroup child of complex reference.</summary>
47
PatchFamilyGroup,
48
+
49
+ /// <summary>ContainerPackage child of complex reference.</summary>
50
+ ContainerPackage,
51
}
52
}
src/WixToolset.Data/WarningMessages.cs
+3
-3
@@ -237,9 +237,9 @@ namespace WixToolset.Data
237
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);
238
}
239
240
- public static Message DownloadUrlNotSupportedForEmbeddedPayloads(SourceLineNumber sourceLineNumbers, string payloadId)
240
+ public static Message DownloadUrlNotSupportedForBAPayloads(SourceLineNumber sourceLineNumbers, string payloadId)
241
{
242
- 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);
242
+ 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);
243
}
244
245
public static Message DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
@@ -785,7 +785,7 @@ namespace WixToolset.Data
785
DiscardedRollbackBoundary = 1129,
786
DeprecatedElement = 1130,
787
CannotUpdateCabCache = 1131,
788
- DownloadUrlNotSupportedForEmbeddedPayloads = 1132,
788
+ DownloadUrlNotSupportedForBAPayloads = 1132,
789
DiscouragedAllUsersValue = 1133,
790
ImplicitlyPerUser = 1134,
791
PerUserButForcingPerMachine = 1135,