diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:43:50 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:50:31 -0700 |
| commit | 38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch) | |
| tree | 803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |
| parent | 8968578d50858721317d410549a9f9b5c62bf1f7 (diff) | |
| download | wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2 wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip | |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
| 13 | using WixToolset.Core.Native; | 13 | using WixToolset.Core.Native; |
| 14 | using WixToolset.Core.WindowsInstaller.Msi; | 14 | using WixToolset.Core.WindowsInstaller.Msi; |
| 15 | using WixToolset.Data; | 15 | using WixToolset.Data; |
| 16 | using WixToolset.Data.Tuples; | 16 | using WixToolset.Data.Symbols; |
| 17 | using WixToolset.Data.WindowsInstaller; | 17 | using WixToolset.Data.WindowsInstaller; |
| 18 | using WixToolset.Extensibility.Services; | 18 | using WixToolset.Extensibility.Services; |
| 19 | 19 | ||
| @@ -46,8 +46,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 46 | 46 | ||
| 47 | public void Execute() | 47 | public void Execute() |
| 48 | { | 48 | { |
| 49 | var wixMergeTuples = this.Section.Tuples.OfType<WixMergeTuple>().ToList(); | 49 | var wixMergeSymbols = this.Section.Symbols.OfType<WixMergeSymbol>().ToList(); |
| 50 | if (!wixMergeTuples.Any()) | 50 | if (!wixMergeSymbols.Any()) |
| 51 | { | 51 | { |
| 52 | return; | 52 | return; |
| 53 | } | 53 | } |
| @@ -69,10 +69,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 69 | merge.OpenDatabase(this.OutputPath); | 69 | merge.OpenDatabase(this.OutputPath); |
| 70 | databaseOpen = true; | 70 | databaseOpen = true; |
| 71 | 71 | ||
| 72 | var featureModulesByMergeId = this.Section.Tuples.OfType<WixFeatureModulesTuple>().GroupBy(t => t.WixMergeRef).ToDictionary(g => g.Key); | 72 | var featureModulesByMergeId = this.Section.Symbols.OfType<WixFeatureModulesSymbol>().GroupBy(t => t.WixMergeRef).ToDictionary(g => g.Key); |
| 73 | 73 | ||
| 74 | // process all the merge rows | 74 | // process all the merge rows |
| 75 | foreach (var wixMergeRow in wixMergeTuples) | 75 | foreach (var wixMergeRow in wixMergeSymbols) |
| 76 | { | 76 | { |
| 77 | var moduleOpen = false; | 77 | var moduleOpen = false; |
| 78 | 78 | ||
| @@ -217,7 +217,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 217 | using (var db = new Database(this.OutputPath, OpenDatabase.Direct)) | 217 | using (var db = new Database(this.OutputPath, OpenDatabase.Direct)) |
| 218 | { | 218 | { |
| 219 | // Suppress individual actions. | 219 | // Suppress individual actions. |
| 220 | foreach (var suppressAction in this.Section.Tuples.OfType<WixSuppressActionTuple>()) | 220 | foreach (var suppressAction in this.Section.Symbols.OfType<WixSuppressActionSymbol>()) |
| 221 | { | 221 | { |
| 222 | var tableName = suppressAction.SequenceTable.WindowsInstallerTableName(); | 222 | var tableName = suppressAction.SequenceTable.WindowsInstallerTableName(); |
| 223 | if (db.TableExists(tableName)) | 223 | if (db.TableExists(tableName)) |
