diff options
Diffstat (limited to 'src/test')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index cc631c22..e96c2ddd 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | |||
@@ -56,7 +56,7 @@ namespace WixToolsetTest.CoreIntegration | |||
56 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"))); | 56 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"))); |
57 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt"))); | 57 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\example.txt"))); |
58 | 58 | ||
59 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wir")); | 59 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir")); |
60 | var section = intermediate.Sections.Single(); | 60 | var section = intermediate.Sections.Single(); |
61 | 61 | ||
62 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 62 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -95,7 +95,7 @@ namespace WixToolsetTest.CoreIntegration | |||
95 | 95 | ||
96 | Assert.Equal(0, result); | 96 | Assert.Equal(0, result); |
97 | 97 | ||
98 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wir")); | 98 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir")); |
99 | var section = intermediate.Sections.Single(); | 99 | var section = intermediate.Sections.Single(); |
100 | 100 | ||
101 | var property = section.Tuples.OfType<PropertyTuple>().Where(p => p.Id.Id == "ExampleProperty").Single(); | 101 | var property = section.Tuples.OfType<PropertyTuple>().Where(p => p.Id.Id == "ExampleProperty").Single(); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index 9d46ba98..126f334d 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |||
@@ -39,7 +39,7 @@ namespace WixToolsetTest.CoreIntegration | |||
39 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 39 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
40 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 40 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); |
41 | 41 | ||
42 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir")); | 42 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); |
43 | var section = intermediate.Sections.Single(); | 43 | var section = intermediate.Sections.Single(); |
44 | 44 | ||
45 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 45 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -74,7 +74,7 @@ namespace WixToolsetTest.CoreIntegration | |||
74 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab"))); | 74 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab"))); |
75 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 75 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
76 | 76 | ||
77 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir")); | 77 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); |
78 | var section = intermediate.Sections.Single(); | 78 | var section = intermediate.Sections.Single(); |
79 | 79 | ||
80 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 80 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -264,7 +264,7 @@ namespace WixToolsetTest.CoreIntegration | |||
264 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm"))); | 264 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm"))); |
265 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 265 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
266 | 266 | ||
267 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir")); | 267 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); |
268 | var section = intermediate.Sections.Single(); | 268 | var section = intermediate.Sections.Single(); |
269 | 269 | ||
270 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 270 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -299,7 +299,7 @@ namespace WixToolsetTest.CoreIntegration | |||
299 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); | 299 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb"))); |
300 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); | 300 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\MsiPackage\test.txt"))); |
301 | 301 | ||
302 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir")); | 302 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); |
303 | var section = intermediate.Sections.Single(); | 303 | var section = intermediate.Sections.Single(); |
304 | 304 | ||
305 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 305 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -399,7 +399,7 @@ namespace WixToolsetTest.CoreIntegration | |||
399 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 399 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
400 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); | 400 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\MsiPackage\test.txt"))); |
401 | 401 | ||
402 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir")); | 402 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); |
403 | var section = intermediate.Sections.Single(); | 403 | var section = intermediate.Sections.Single(); |
404 | 404 | ||
405 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 405 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -435,7 +435,7 @@ namespace WixToolsetTest.CoreIntegration | |||
435 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 435 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
436 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); | 436 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); |
437 | 437 | ||
438 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir")); | 438 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"test.wir")); |
439 | var section = intermediate.Sections.Single(); | 439 | var section = intermediate.Sections.Single(); |
440 | 440 | ||
441 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 441 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index 498b1492..a51d831f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs | |||
@@ -43,7 +43,7 @@ namespace WixToolsetTest.CoreIntegration | |||
43 | }, out var messagesBind); | 43 | }, out var messagesBind); |
44 | Assert.Equal(0, result); | 44 | Assert.Equal(0, result); |
45 | 45 | ||
46 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir")); | 46 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"obj\test.wir")); |
47 | var section = intermediate.Sections.Single(); | 47 | var section = intermediate.Sections.Single(); |
48 | 48 | ||
49 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 49 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |