diff options
Diffstat (limited to 'src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs index 13dd0160..95805658 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs | |||
| @@ -14,7 +14,8 @@ namespace WixToolsetTest.BuildTasks | |||
| 14 | 14 | ||
| 15 | public class MsbuildHeatFixture | 15 | public class MsbuildHeatFixture |
| 16 | { | 16 | { |
| 17 | private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath), "wix.targets"); | 17 | private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\"; |
| 18 | private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets"); | ||
| 18 | 19 | ||
| 19 | [Fact] | 20 | [Fact] |
| 20 | public void CanBuildHeatFilePackage() | 21 | public void CanBuildHeatFilePackage() |
| @@ -30,6 +31,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 30 | var result = MsbuildRunner.Execute(projectPath, new[] | 31 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 31 | { | 32 | { |
| 32 | $"-p:WixTargetsPath={WixTargetsPath}", | 33 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 34 | $"-p:WixBinDir={WixBinPath}", | ||
| 33 | $"-p:IntermediateOutputPath={intermediateFolder}", | 35 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| 34 | $"-p:OutputPath={binFolder}" | 36 | $"-p:OutputPath={binFolder}" |
| 35 | }); | 37 | }); |
| @@ -86,6 +88,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 86 | var result = MsbuildRunner.Execute(projectPath, new[] | 88 | var result = MsbuildRunner.Execute(projectPath, new[] |
| 87 | { | 89 | { |
| 88 | $"-p:WixTargetsPath={WixTargetsPath}", | 90 | $"-p:WixTargetsPath={WixTargetsPath}", |
| 91 | $"-p:WixBinDir={WixBinPath}", | ||
| 89 | $"-p:IntermediateOutputPath={intermediateFolder}", | 92 | $"-p:IntermediateOutputPath={intermediateFolder}", |
| 90 | $"-p:OutputPath={binFolder}" | 93 | $"-p:OutputPath={binFolder}" |
| 91 | }); | 94 | }); |
