From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../Bind/MergeModulesCommand.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 1f85a33f..80684e7c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs @@ -13,7 +13,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.Native; using WixToolset.Core.WindowsInstaller.Msi; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility.Services; @@ -46,8 +46,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind public void Execute() { - var wixMergeTuples = this.Section.Tuples.OfType().ToList(); - if (!wixMergeTuples.Any()) + var wixMergeSymbols = this.Section.Symbols.OfType().ToList(); + if (!wixMergeSymbols.Any()) { return; } @@ -69,10 +69,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind merge.OpenDatabase(this.OutputPath); databaseOpen = true; - var featureModulesByMergeId = this.Section.Tuples.OfType().GroupBy(t => t.WixMergeRef).ToDictionary(g => g.Key); + var featureModulesByMergeId = this.Section.Symbols.OfType().GroupBy(t => t.WixMergeRef).ToDictionary(g => g.Key); // process all the merge rows - foreach (var wixMergeRow in wixMergeTuples) + foreach (var wixMergeRow in wixMergeSymbols) { var moduleOpen = false; @@ -217,7 +217,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using (var db = new Database(this.OutputPath, OpenDatabase.Direct)) { // Suppress individual actions. - foreach (var suppressAction in this.Section.Tuples.OfType()) + foreach (var suppressAction in this.Section.Symbols.OfType()) { var tableName = suppressAction.SequenceTable.WindowsInstallerTableName(); if (db.TableExists(tableName)) -- cgit v1.2.3-55-g6feb