diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-25 01:41:25 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-25 01:41:25 -0700 |
| commit | 98bdcfac8bd4f699bc6865abd283f710943e77bc (patch) | |
| tree | 1823623e090e5b79d369699e0481ea4dd92b3568 /src/WixToolset.Core.WindowsInstaller/Bind | |
| parent | 9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5 (diff) | |
| download | wix-98bdcfac8bd4f699bc6865abd283f710943e77bc.tar.gz wix-98bdcfac8bd4f699bc6865abd283f710943e77bc.tar.bz2 wix-98bdcfac8bd4f699bc6865abd283f710943e77bc.zip | |
Remove explicit intermediate file provided for testing
We have a real WixOutput now that officially provides all the necessary
information, so use that instead.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 3e4806a7..77d0c9bb 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
| @@ -532,12 +532,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 532 | // TODO: this is not sufficient to collect all Input files (for example, it misses Binary and Icon tables). | 532 | // TODO: this is not sufficient to collect all Input files (for example, it misses Binary and Icon tables). |
| 533 | trackedFiles.AddRange(fileFacades.Select(f => this.BackendHelper.TrackFile(f.File.Source.Path, TrackedFileType.Input, f.File.SourceLineNumbers))); | 533 | trackedFiles.AddRange(fileFacades.Select(f => this.BackendHelper.TrackFile(f.File.Source.Path, TrackedFileType.Input, f.File.SourceLineNumbers))); |
| 534 | this.TrackedFiles = trackedFiles; | 534 | this.TrackedFiles = trackedFiles; |
| 535 | |||
| 536 | // TODO: Eventually this gets removed | ||
| 537 | var intermediate = new Intermediate(this.Intermediate.Id, new[] { section }, this.Intermediate.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase)); | ||
| 538 | var trackIntermediate = this.BackendHelper.TrackFile(Path.Combine(this.IntermediateFolder, Path.GetFileName(Path.ChangeExtension(this.OutputPath, "wir"))), TrackedFileType.Intermediate); | ||
| 539 | intermediate.Save(trackIntermediate.Path); | ||
| 540 | trackedFiles.Add(trackIntermediate); | ||
| 541 | } | 535 | } |
| 542 | 536 | ||
| 543 | private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, Output output) | 537 | private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, Output output) |
