@joebigelow / wix-1 / commits / 98bdcfac

Remove explicit intermediate file provided for testing

We have a real WixOutput now that officially provides all the necessary information, so use that instead.

Rob Mensching committed Oct 25, 2019 at 01:41 UTC 98bdcfac8bd4f699bc6865abd283f710943e77bc

6 files changed +18 -24

src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs

-6

@@ -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).

533 trackedFiles.AddRange(fileFacades.Select(f => this.BackendHelper.TrackFile(f.File.Source.Path, TrackedFileType.Input, f.File.SourceLineNumbers)));

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);

535 }

536

537 private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, Output output)

src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs

+2 -2

@@ -55,7 +55,7 @@ namespace WixToolsetTest.CoreIntegration

55 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb")));

56 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt")));

58 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir"));

58 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"));

59 var section = intermediate.Sections.Single();

61 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -94,7 +94,7 @@ namespace WixToolsetTest.CoreIntegration

95 result.AssertSuccess();

97 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir"));

97 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"));

98 var section = intermediate.Sections.Single();

100 var property = section.Tuples.OfType<PropertyTuple>().Where(p => p.Id.Id == "ExampleProperty").Single();

src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs

+1 -1

@@ -40,7 +40,7 @@ namespace WixToolsetTest.CoreIntegration

40 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));

41 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt")));

43 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

43 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

44 var section = intermediate.Sections.Single();

46 var actions = section.Tuples.OfType<WixActionTuple>().Where(wat => wat.Action.StartsWith("Set")).ToList();

src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs

+10 -10

@@ -40,7 +40,7 @@ namespace WixToolsetTest.CoreIntegration

40 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));

41 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt")));

43 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

43 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

44 var section = intermediate.Sections.Single();

46 var fileTuple = section.Tuples.OfType<FileTuple>().First();

@@ -75,7 +75,7 @@ namespace WixToolsetTest.CoreIntegration

75 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab")));

76 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));

78 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

78 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));

79 var section = intermediate.Sections.Single();

81 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -274,7 +274,7 @@ namespace WixToolsetTest.CoreIntegration

274 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));

275 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt")));

276

277 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

277 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

278 var section = intermediate.Sections.Single();

279

280 var error = section.Tuples.OfType<ErrorTuple>().Single();

@@ -341,7 +341,7 @@ namespace WixToolsetTest.CoreIntegration

341 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm")));

342 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));

343

344 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

344 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));

345 var section = intermediate.Sections.Single();

346

347 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -376,7 +376,7 @@ namespace WixToolsetTest.CoreIntegration

376 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));

377 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt")));

378

379 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

379 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));

380 var section = intermediate.Sections.Single();

381

382 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -542,7 +542,7 @@ namespace WixToolsetTest.CoreIntegration

542 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));

543 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt")));

544

545 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

545 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

546 var section = intermediate.Sections.Single();

547

548 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -578,7 +578,7 @@ namespace WixToolsetTest.CoreIntegration

578 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));

579 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe")));

580

581 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

581 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

582 var section = intermediate.Sections.Single();

583

584 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -632,7 +632,7 @@ namespace WixToolsetTest.CoreIntegration

632

633 result.AssertSuccess();

634

635 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

635 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

636 var section = intermediate.Sections.Single();

637

638 var platformSummary = section.Tuples.OfType<SummaryInformationTuple>().Single(s => s.PropertyId == SumaryInformationType.PlatformAndLanguage);

@@ -664,7 +664,7 @@ namespace WixToolsetTest.CoreIntegration

664

665 result.AssertSuccess();

666

667 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

667 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

668 var section = intermediate.Sections.Single();

669

670 // Only one component is shared.

@@ -736,7 +736,7 @@ namespace WixToolsetTest.CoreIntegration

736 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));

737 Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\Foo.exe")));

738

739 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

739 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

740 var section = intermediate.Sections.Single();

741

742 var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList();

src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs

+2 -2

@@ -47,7 +47,7 @@ namespace WixToolsetTest.CoreIntegration

48 result.AssertSuccess();

50 - var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir"));

50 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

51 var section = intermediate.Sections.Single();

53 var fileTuple = section.Tuples.OfType<FileTuple>().First();

@@ -116,7 +116,7 @@ namespace WixToolsetTest.CoreIntegration

116

117 result.AssertSuccess();

118

119 - var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir"));

119 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

120 var section = intermediate.Sections.Single();

121

122 {

src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs

+3 -3

@@ -47,7 +47,7 @@ namespace WixToolsetTest.CoreIntegration

48 result.AssertSuccess();

50 - var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir"));

50 + var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));

51 var section = intermediate.Sections.Single();

53 var wixFile = section.Tuples.OfType<FileTuple>().First();

@@ -92,7 +92,7 @@ namespace WixToolsetTest.CoreIntegration

93 result.AssertSuccess();

95 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

95 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));

96 var section = intermediate.Sections.Single();

98 var fileTuple = section.Tuples.OfType<FileTuple>().Single();

@@ -154,7 +154,7 @@ namespace WixToolsetTest.CoreIntegration

154

155 result.AssertSuccess();

156

157 - var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));

157 + var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));

158 var section = intermediate.Sections.Single();

159

160 var fileTuples = section.Tuples.OfType<FileTuple>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray();