diff options
author | Rob Mensching <rob@firegiant.com> | 2019-05-08 14:13:31 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2019-05-08 14:44:43 -0700 |
commit | 75fd55d5a71c492c6ea904768858c51aa97da29f (patch) | |
tree | 610047db1d5759a726ce88277bb2dfddcd01da45 /src/WixToolset.Core/Linker.cs | |
parent | d1dbe29f3856d012acf5f96e8e66c43b74ab490d (diff) | |
download | wix-75fd55d5a71c492c6ea904768858c51aa97da29f.tar.gz wix-75fd55d5a71c492c6ea904768858c51aa97da29f.tar.bz2 wix-75fd55d5a71c492c6ea904768858c51aa97da29f.zip |
Use new strongly typed tuples
Diffstat (limited to 'src/WixToolset.Core/Linker.cs')
-rw-r--r-- | src/WixToolset.Core/Linker.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs index 9b32ad1d..13efe6c5 100644 --- a/src/WixToolset.Core/Linker.cs +++ b/src/WixToolset.Core/Linker.cs | |||
@@ -11,6 +11,7 @@ namespace WixToolset.Core | |||
11 | using WixToolset.Core.Link; | 11 | using WixToolset.Core.Link; |
12 | using WixToolset.Data; | 12 | using WixToolset.Data; |
13 | using WixToolset.Data.Tuples; | 13 | using WixToolset.Data.Tuples; |
14 | using WixToolset.Data.WindowsInstaller; | ||
14 | using WixToolset.Extensibility.Data; | 15 | using WixToolset.Extensibility.Data; |
15 | using WixToolset.Extensibility.Services; | 16 | using WixToolset.Extensibility.Services; |
16 | 17 | ||
@@ -225,7 +226,7 @@ namespace WixToolset.Core | |||
225 | sectionCount++; | 226 | sectionCount++; |
226 | 227 | ||
227 | var sectionId = section.Id; | 228 | var sectionId = section.Id; |
228 | if (null == sectionId && sectionIdOnRows) | 229 | if (null == sectionId && this.sectionIdOnRows) |
229 | { | 230 | { |
230 | sectionId = "wix.section." + sectionCount.ToString(CultureInfo.InvariantCulture); | 231 | sectionId = "wix.section." + sectionCount.ToString(CultureInfo.InvariantCulture); |
231 | } | 232 | } |
@@ -611,7 +612,7 @@ namespace WixToolset.Core | |||
611 | #endif | 612 | #endif |
612 | 613 | ||
613 | //correct the section Id in FeatureComponents table | 614 | //correct the section Id in FeatureComponents table |
614 | if (sectionIdOnRows) | 615 | if (this.sectionIdOnRows) |
615 | { | 616 | { |
616 | //var componentSectionIds = new Dictionary<string, string>(); | 617 | //var componentSectionIds = new Dictionary<string, string>(); |
617 | 618 | ||