aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Link/WixGroupingOrdering.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Link/WixGroupingOrdering.cs')
-rw-r--r--src/WixToolset.Core/Link/WixGroupingOrdering.cs11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index 99220900..f9de82a9 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -62,7 +62,7 @@ namespace WixToolset.Core.Link
62 /// <param name="parentType">The group type for the parent group to flatten.</param> 62 /// <param name="parentType">The group type for the parent group to flatten.</param>
63 /// <param name="parentId">The identifier of the parent group to flatten.</param> 63 /// <param name="parentId">The identifier of the parent group to flatten.</param>
64 /// <param name="removeUsedRows">Whether to remove used group rows before returning.</param> 64 /// <param name="removeUsedRows">Whether to remove used group rows before returning.</param>
65 public void FlattenAndRewriteRows(ComplexReferenceChildType parentType, string parentId, bool removeUsedRows) 65 public void FlattenAndRewriteRows(ComplexReferenceParentType parentType, string parentId, bool removeUsedRows)
66 { 66 {
67 var parentTypeString = parentType.ToString(); 67 var parentTypeString = parentType.ToString();
68 Debug.Assert(this.groupTypes.Contains(parentTypeString)); 68 Debug.Assert(this.groupTypes.Contains(parentTypeString));
@@ -648,14 +648,11 @@ namespace WixToolset.Core.Link
648 // We *don't* propagate ordering information from Packages or 648 // We *don't* propagate ordering information from Packages or
649 // Containers to their children, because ordering doesn't matter 649 // Containers to their children, because ordering doesn't matter
650 // for them, and a Payload in two Packages (or Containers) can 650 // for them, and a Payload in two Packages (or Containers) can
651 // cause a circular reference to occur. We do, however, need to 651 // cause a circular reference to occur.
652 // track the ordering in the UX Container, because we need the
653 // first payload to be the entrypoint.
654 private bool ShouldItemPropagateChildOrdering() 652 private bool ShouldItemPropagateChildOrdering()
655 { 653 {
656 if (String.Equals(nameof(ComplexReferenceChildType.Package), this.Type, StringComparison.Ordinal) || 654 if (String.Equals(nameof(ComplexReferenceParentType.Package), this.Type, StringComparison.Ordinal) ||
657 (String.Equals(nameof(ComplexReferenceParentType.Container), this.Type, StringComparison.Ordinal) && 655 String.Equals(nameof(ComplexReferenceParentType.Container), this.Type, StringComparison.Ordinal))
658 !String.Equals(BurnConstants.BurnUXContainerName, this.Id, StringComparison.Ordinal)))
659 { 656 {
660 return false; 657 return false;
661 } 658 }