aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-30 18:55:57 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-31 15:11:21 +1000
commit05ee2175b44c68816c24a33a16861a637fa15ad7 (patch)
tree1558e82360c67ca17fbc4440b773b7d74be5aac1 /src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
parentd57dad051e9c15919646fb9e4fb320003ba839da (diff)
downloadwix-05ee2175b44c68816c24a33a16861a637fa15ad7.tar.gz
wix-05ee2175b44c68816c24a33a16861a637fa15ad7.tar.bz2
wix-05ee2175b44c68816c24a33a16861a637fa15ad7.zip
Update MSBuild tests to use WixToolset.MSBuild.props to find wix.targets.
Diffstat (limited to 'src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs')
-rw-r--r--src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
index b5331cbc..58a3d333 100644
--- a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
@@ -13,7 +13,7 @@ namespace WixToolsetTest.MSBuild
13 13
14 public class MsbuildHeatFixture 14 public class MsbuildHeatFixture
15 { 15 {
16 private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets"); 16 private static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
17 17
18 [Fact] 18 [Fact]
19 public void CanBuildHeatFilePackage() 19 public void CanBuildHeatFilePackage()
@@ -30,7 +30,7 @@ namespace WixToolsetTest.MSBuild
30 30
31 var result = MsbuildRunner.Execute(projectPath, new[] 31 var result = MsbuildRunner.Execute(projectPath, new[]
32 { 32 {
33 $"-p:WixTargetsPath={WixTargetsPath}", 33 $"-p:WixMSBuildProps={WixPropsPath}",
34 }); 34 });
35 result.AssertSuccess(); 35 result.AssertSuccess();
36 36
@@ -86,7 +86,7 @@ namespace WixToolsetTest.MSBuild
86 86
87 var result = MsbuildRunner.Execute(projectPath, new[] 87 var result = MsbuildRunner.Execute(projectPath, new[]
88 { 88 {
89 $"-p:WixTargetsPath={WixTargetsPath}", 89 $"-p:WixMSBuildProps={WixPropsPath}",
90 }); 90 });
91 result.AssertSuccess(); 91 result.AssertSuccess();
92 92