diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-05 12:55:26 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-06 16:10:05 -0700 |
| commit | 860f77f7c9d522074dc7e44cfe11281efd20687f (patch) | |
| tree | 49527e82264f2dac88247885e937f935ae2ac658 /src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |
| parent | 94db5671e85ce63487e3a415251cad0eb6abe3d1 (diff) | |
| download | wix-860f77f7c9d522074dc7e44cfe11281efd20687f.tar.gz wix-860f77f7c9d522074dc7e44cfe11281efd20687f.tar.bz2 wix-860f77f7c9d522074dc7e44cfe11281efd20687f.zip | |
Introduce "Subdirectory" which simplifies inline directory syntax
Completes wixtoolset/issues#4727
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index a8ea0a18..3bdfa0ef 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |||
| @@ -40,7 +40,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 40 | 40 | ||
| 41 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); | 41 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); |
| 42 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 42 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 43 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 43 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt"))); |
| 44 | 44 | ||
| 45 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 45 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 46 | 46 | ||
| @@ -240,7 +240,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 240 | 240 | ||
| 241 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); | 241 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); |
| 242 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 242 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 243 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 243 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt"))); |
| 244 | 244 | ||
| 245 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 245 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 246 | var section = intermediate.Sections.Single(); | 246 | var section = intermediate.Sections.Single(); |
| @@ -351,7 +351,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 351 | var pdbPath = Path.Combine(intermediateFolder, @"bin\test.wixpdb"); | 351 | var pdbPath = Path.Combine(intermediateFolder, @"bin\test.wixpdb"); |
| 352 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi"))); | 352 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi"))); |
| 353 | Assert.True(File.Exists(pdbPath)); | 353 | Assert.True(File.Exists(pdbPath)); |
| 354 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); | 354 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\PFiles\MsiPackage\test.txt"))); |
| 355 | 355 | ||
| 356 | var intermediate = Intermediate.Load(pdbPath); | 356 | var intermediate = Intermediate.Load(pdbPath); |
| 357 | var section = intermediate.Sections.Single(); | 357 | var section = intermediate.Sections.Single(); |
| @@ -527,7 +527,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 527 | 527 | ||
| 528 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); | 528 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); |
| 529 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 529 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 530 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 530 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\test.txt"))); |
| 531 | 531 | ||
| 532 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 532 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 533 | var section = intermediate.Sections.Single(); | 533 | var section = intermediate.Sections.Single(); |
| @@ -563,7 +563,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 563 | 563 | ||
| 564 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); | 564 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); |
| 565 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 565 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 566 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); | 566 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\AssemblyMsiPackage\candle.exe"))); |
| 567 | 567 | ||
| 568 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 568 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 569 | var section = intermediate.Sections.Single(); | 569 | var section = intermediate.Sections.Single(); |
| @@ -721,7 +721,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 721 | 721 | ||
| 722 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); | 722 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); |
| 723 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 723 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
| 724 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\Foo.exe"))); | 724 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\PFiles\MsiPackage\Foo.exe"))); |
| 725 | 725 | ||
| 726 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); | 726 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); |
| 727 | var section = intermediate.Sections.Single(); | 727 | var section = intermediate.Sections.Single(); |
