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.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index 7e0030ca..a7013062 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Core.Link
10 using System.Linq; 10 using System.Linq;
11 using System.Text; 11 using System.Text;
12 using WixToolset.Data; 12 using WixToolset.Data;
13 using WixToolset.Data.Tuples; 13 using WixToolset.Data.Symbols;
14 using WixToolset.Extensibility.Services; 14 using WixToolset.Extensibility.Services;
15 using WixToolset.Data.Burn; 15 using WixToolset.Data.Burn;
16 16
@@ -155,7 +155,7 @@ namespace WixToolset.Core.Link
155 foreach (int rowIndex in sortedIndexes) 155 foreach (int rowIndex in sortedIndexes)
156 { 156 {
157 //wixGroupTable.Rows.RemoveAt(rowIndex); 157 //wixGroupTable.Rows.RemoveAt(rowIndex);
158 this.EntrySection.Tuples.RemoveAt(rowIndex); 158 this.EntrySection.Symbols.RemoveAt(rowIndex);
159 } 159 }
160 } 160 }
161 161
@@ -173,7 +173,7 @@ namespace WixToolset.Core.Link
173 // groups to read from that table instead. 173 // groups to read from that table instead.
174 foreach (var item in orderedItems) 174 foreach (var item in orderedItems)
175 { 175 {
176 this.EntrySection.AddTuple(new WixGroupTuple(item.Row.SourceLineNumbers) 176 this.EntrySection.AddSymbol(new WixGroupSymbol(item.Row.SourceLineNumbers)
177 { 177 {
178 ParentId = parentId, 178 ParentId = parentId,
179 ParentType = (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), parentType), 179 ParentType = (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), parentType),
@@ -238,9 +238,9 @@ namespace WixToolset.Core.Link
238 //} 238 //}
239 239
240 // Collect all of the groups 240 // Collect all of the groups
241 for (int rowIndex = 0; rowIndex < this.EntrySection.Tuples.Count; ++rowIndex) 241 for (int rowIndex = 0; rowIndex < this.EntrySection.Symbols.Count; ++rowIndex)
242 { 242 {
243 if (this.EntrySection.Tuples[rowIndex] is WixGroupTuple row) 243 if (this.EntrySection.Symbols[rowIndex] is WixGroupSymbol row)
244 { 244 {
245 var rowParentName = row.ParentId; 245 var rowParentName = row.ParentId;
246 var rowParentType = row.ParentType.ToString(); 246 var rowParentType = row.ParentType.ToString();
@@ -357,7 +357,7 @@ namespace WixToolset.Core.Link
357 // return; 357 // return;
358 //} 358 //}
359 359
360 foreach (var row in this.EntrySection.Tuples.OfType<WixOrderingTuple>()) 360 foreach (var row in this.EntrySection.Symbols.OfType<WixOrderingSymbol>())
361 { 361 {
362 var rowItemType = row.ItemType.ToString(); 362 var rowItemType = row.ItemType.ToString();
363 var rowItemName = row.ItemIdRef; 363 var rowItemName = row.ItemIdRef;
@@ -513,7 +513,7 @@ namespace WixToolset.Core.Link
513 private readonly ItemCollection beforeItems; // for checking for circular references 513 private readonly ItemCollection beforeItems; // for checking for circular references
514 private bool flattenedAfterItems; 514 private bool flattenedAfterItems;
515 515
516 public Item(IntermediateTuple row, string type, string id) 516 public Item(IntermediateSymbol row, string type, string id)
517 { 517 {
518 this.Row = row; 518 this.Row = row;
519 this.Type = type; 519 this.Type = type;
@@ -526,7 +526,7 @@ namespace WixToolset.Core.Link
526 this.flattenedAfterItems = false; 526 this.flattenedAfterItems = false;
527 } 527 }
528 528
529 public IntermediateTuple Row { get; private set; } 529 public IntermediateSymbol Row { get; private set; }
530 public string Type { get; private set; } 530 public string Type { get; private set; }
531 public string Id { get; private set; } 531 public string Id { get; private set; }
532 public string Key { get; private set; } 532 public string Key { get; private set; }