summaryrefslogtreecommitdiff
path: root/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs')
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 0bee1b01..f0761762 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -6,6 +6,8 @@ namespace WixToolsetTest.Sdk
6 using System.Collections.Generic; 6 using System.Collections.Generic;
7 using System.IO; 7 using System.IO;
8 using System.Linq; 8 using System.Linq;
9 using System.Runtime.CompilerServices;
10 using System.Threading;
9 using WixBuildTools.TestSupport; 11 using WixBuildTools.TestSupport;
10 using Xunit; 12 using Xunit;
11 13
@@ -328,6 +330,10 @@ namespace WixToolsetTest.Sdk
328 { 330 {
329 var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage"); 331 var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage");
330 332
333 var testLogsFolder = TestData.GetUnitTestLogsFolder();
334 File.Delete(Path.Combine(testLogsFolder, buildSystem + ".binlog"));
335 File.Delete(Path.Combine(testLogsFolder, buildSystem + ".msi"));
336
331 using (var fs = new TestDataFolderFileSystem()) 337 using (var fs = new TestDataFolderFileSystem())
332 { 338 {
333 fs.Initialize(sourceFolder); 339 fs.Initialize(sourceFolder);
@@ -335,7 +341,9 @@ namespace WixToolsetTest.Sdk
335 var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); 341 var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
336 342
337 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, suppressValidation: false); 343 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, suppressValidation: false);
338 Assert.Equal(1, result.ExitCode); 344
345 File.Copy(Path.ChangeExtension(projectPath, ".binlog"), Path.Combine(testLogsFolder, buildSystem + ".binlog"));
346 File.Copy(Path.Combine(baseFolder, "obj", "x86", "Release", "en-US", "MsiPackage.msi"), Path.Combine(testLogsFolder, buildSystem + ".msi"));
339 347
340 var iceIssues = result.Output.Where(line => line.Contains(": error") || line.Contains(": warning")) 348 var iceIssues = result.Output.Where(line => line.Contains(": error") || line.Contains(": warning"))
341 .Select(line => line.Replace(baseFolder, "<baseFolder>") 349 .Select(line => line.Replace(baseFolder, "<baseFolder>")