aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs')
-rw-r--r--src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
index abb8673d..4a831061 100644
--- a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
@@ -11,7 +11,7 @@ namespace WixToolsetTest.MSBuild
11 11
12 public class MsbuildFixture 12 public class MsbuildFixture
13 { 13 {
14 private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets"); 14 private static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
15 15
16 [Fact] 16 [Fact]
17 public void CanBuildSimpleBundle() 17 public void CanBuildSimpleBundle()
@@ -27,7 +27,7 @@ namespace WixToolsetTest.MSBuild
27 27
28 var result = MsbuildRunner.Execute(projectPath, new[] 28 var result = MsbuildRunner.Execute(projectPath, new[]
29 { 29 {
30 $"-p:WixTargetsPath={WixTargetsPath}", 30 $"-p:WixMSBuildProps={WixPropsPath}",
31 }); 31 });
32 result.AssertSuccess(); 32 result.AssertSuccess();
33 33
@@ -63,7 +63,7 @@ namespace WixToolsetTest.MSBuild
63 63
64 var result = MsbuildRunner.Execute(projectPath, new[] 64 var result = MsbuildRunner.Execute(projectPath, new[]
65 { 65 {
66 $"-p:WixTargetsPath={WixTargetsPath}", 66 $"-p:WixMSBuildProps={WixPropsPath}",
67 }); 67 });
68 result.AssertSuccess(); 68 result.AssertSuccess();
69 69
@@ -124,7 +124,7 @@ namespace WixToolsetTest.MSBuild
124 var result = MsbuildRunner.Execute(projectPath, new[] 124 var result = MsbuildRunner.Execute(projectPath, new[]
125 { 125 {
126 wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}", 126 wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
127 $"-p:WixTargetsPath={WixTargetsPath}", 127 $"-p:WixMSBuildProps={WixPropsPath}",
128 }); 128 });
129 result.AssertSuccess(); 129 result.AssertSuccess();
130 130
@@ -150,7 +150,7 @@ namespace WixToolsetTest.MSBuild
150 150
151 var result = MsbuildRunner.Execute(projectPath, new[] 151 var result = MsbuildRunner.Execute(projectPath, new[]
152 { 152 {
153 $"-p:WixTargetsPath={WixTargetsPath}", 153 $"-p:WixMSBuildProps={WixPropsPath}",
154 $"-p:InstallerPlatform=x64", 154 $"-p:InstallerPlatform=x64",
155 }); 155 });
156 result.AssertSuccess(); 156 result.AssertSuccess();
@@ -185,7 +185,7 @@ namespace WixToolsetTest.MSBuild
185 185
186 var result = MsbuildRunner.Execute(projectPath, new[] 186 var result = MsbuildRunner.Execute(projectPath, new[]
187 { 187 {
188 $"-p:WixTargetsPath={WixTargetsPath}", 188 $"-p:WixMSBuildProps={WixPropsPath}",
189 "-p:SuppressIces=\"ICE45;ICE46\"" 189 "-p:SuppressIces=\"ICE45;ICE46\""
190 }); 190 });
191 result.AssertSuccess(); 191 result.AssertSuccess();
@@ -206,7 +206,7 @@ namespace WixToolsetTest.MSBuild
206 206
207 var result = MsbuildRunner.Execute(projectPath, new[] 207 var result = MsbuildRunner.Execute(projectPath, new[]
208 { 208 {
209 $"-p:WixTargetsPath={WixTargetsPath}", 209 $"-p:WixMSBuildProps={WixPropsPath}",
210 "-p:SuppressSpecificWarnings=\"1118;1102\"" 210 "-p:SuppressSpecificWarnings=\"1118;1102\""
211 }); 211 });
212 result.AssertSuccess(); 212 result.AssertSuccess();
@@ -230,7 +230,7 @@ namespace WixToolsetTest.MSBuild
230 230
231 var result = MsbuildRunner.Execute(projectPath, new[] 231 var result = MsbuildRunner.Execute(projectPath, new[]
232 { 232 {
233 $"-p:WixTargetsPath={WixTargetsPath}", 233 $"-p:WixMSBuildProps={WixPropsPath}",
234 "-p:OutputType=IntermediatePostLink" 234 "-p:OutputType=IntermediatePostLink"
235 }); 235 });
236 result.AssertSuccess(); 236 result.AssertSuccess();
@@ -256,7 +256,7 @@ namespace WixToolsetTest.MSBuild
256 // Build 256 // Build
257 var result = MsbuildRunner.Execute(projectPath, new[] 257 var result = MsbuildRunner.Execute(projectPath, new[]
258 { 258 {
259 $"-p:WixTargetsPath={WixTargetsPath}", 259 $"-p:WixMSBuildProps={WixPropsPath}",
260 "-v:diag" 260 "-v:diag"
261 }); 261 });
262 result.AssertSuccess(); 262 result.AssertSuccess();
@@ -272,7 +272,7 @@ namespace WixToolsetTest.MSBuild
272 // Clean 272 // Clean
273 result = MsbuildRunner.Execute(projectPath, new[] 273 result = MsbuildRunner.Execute(projectPath, new[]
274 { 274 {
275 $"-p:WixTargetsPath={WixTargetsPath}", 275 $"-p:WixMSBuildProps={WixPropsPath}",
276 "-t:Clean", 276 "-t:Clean",
277 "-v:diag" 277 "-v:diag"
278 }); 278 });