From 7113e775cf68aba493c5e769e8e5584db15d1974 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 24 Sep 2022 10:58:17 -0700
Subject: Symbols won't have section ids.

---
 .../CreateWindowsInstallerDataFromIRCommand.cs     |  3 ---
 src/wix/WixToolset.Core/Linker.cs                  | 29 ----------------------
 2 files changed, 32 deletions(-)

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index 4d99ff40..cdb8da2b 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -1183,9 +1183,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 var customRow = this.CreateRow(firstCellSymbol, customTableDefinition);
                 var customRowFieldsByColumnName = customRow.Fields.ToDictionary(f => f.Column.Name);
 
-#if TODO // SectionId seems like a good thing to preserve.
-                customRow.SectionId = symbol.SectionId;
-#endif
                 foreach (var cell in rowOfCells)
                 {
                     var data = cell.Data;
diff --git a/src/wix/WixToolset.Core/Linker.cs b/src/wix/WixToolset.Core/Linker.cs
index 40654735..1aeb783b 100644
--- a/src/wix/WixToolset.Core/Linker.cs
+++ b/src/wix/WixToolset.Core/Linker.cs
@@ -22,8 +22,6 @@ namespace WixToolset.Core
     {
         private static readonly string EmptyGuid = Guid.Empty.ToString("B");
 
-        private readonly bool sectionIdOnRows;
-
         /// <summary>
         /// Creates a linker.
         /// </summary>
@@ -31,7 +29,6 @@ namespace WixToolset.Core
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
-            this.sectionIdOnRows = true; // TODO: what is the correct value for this?
         }
 
         private IServiceProvider ServiceProvider { get; }
@@ -182,18 +179,8 @@ namespace WixToolset.Core
                 // metadata.
                 var resolvedSection = new IntermediateSection(find.EntrySection.Id, find.EntrySection.Type);
 
-                var sectionCount = 0;
-
                 foreach (var section in sections)
                 {
-                    sectionCount++;
-
-                    var sectionId = section.Id;
-                    if (null == sectionId && this.sectionIdOnRows)
-                    {
-                        sectionId = "wix.section." + sectionCount.ToString(CultureInfo.InvariantCulture);
-                    }
-
                     foreach (var symbol in section.Symbols)
                     {
                         if (find.RedundantSymbols.Contains(symbol))
@@ -289,22 +276,6 @@ namespace WixToolset.Core
                     }
                 }
 
-                // Correct the section Id in FeatureComponents table.
-                if (this.sectionIdOnRows)
-                {
-#if TODO_DO_SYMBOLS_NEED_SECTIONIDS
-                    var componentSectionIds = resolvedSection.Symbols.OfType<ComponentSymbol>().ToDictionary(c => c.Id.Id, c => c.SectionId);
-
-                    foreach (var featureComponentSymbol in resolvedSection.Symbols.OfType<FeatureComponentsSymbol>())
-                    {
-                        if (componentSectionIds.TryGetValue(featureComponentSymbol.ComponentRef, out var componentSectionId))
-                        {
-                            featureComponentSymbol.SectionId = componentSectionId;
-                        }
-                    }
-#endif
-                }
-
                 // Copy the wix variable rows to the output now that all overriding has been accounted for.
                 foreach (var symbol in wixVariables.Values)
                 {
-- 
cgit v1.2.3-55-g6feb