5 files changed, 149 insertions, 82 deletions

diff --git a/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs b/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs
deleted file mode 100644
index 8fd69414..00000000
--- a/src/test/WixToolsetTest.BuildTasks/FakeBuildEngine.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.BuildTasks
-{
-    using System.Collections;
-    using System.Text;
-    using Microsoft.Build.Framework;
-
-    internal class FakeBuildEngine : IBuildEngine
-    {
-        private StringBuilder output = new StringBuilder();
-
-        public int ColumnNumberOfTaskNode => 0;
-
-        public bool ContinueOnError => false;
-
-        public int LineNumberOfTaskNode => 0;
-
-        public string ProjectFileOfTaskNode => "fake_wix.targets";
-
-        public string Output => this.output.ToString();
-
-        public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs) => throw new System.NotImplementedException();
-
-        public void LogCustomEvent(CustomBuildEventArgs e) => this.output.AppendLine(e.Message);
-
-        public void LogErrorEvent(BuildErrorEventArgs e) => this.output.AppendLine(e.Message);
-
-        public void LogMessageEvent(BuildMessageEventArgs e) => this.output.AppendLine(e.Message);
-
-        public void LogWarningEvent(BuildWarningEventArgs e) => this.output.AppendLine(e.Message);
-    }
-}
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
index a27928d5..95b727ad 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
@@ -2,62 +2,103 @@
 
 namespace WixToolsetTest.BuildTasks
 {
+    using System;
     using System.IO;
     using System.Linq;
-    using Microsoft.Build.Utilities;
     using WixBuildTools.TestSupport;
     using WixToolset.BuildTasks;
-    using WixToolset.Data;
-    using WixToolset.Data.Tuples;
     using Xunit;
 
-    public partial class MsbuildFixture
+    public class MsbuildFixture
     {
+        private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets");
+
+        public MsbuildFixture()
+        {
+            this.MsbuildRunner = new MsbuildRunner();
+        }
+
+        private MsbuildRunner MsbuildRunner { get; }
+
         [Fact]
         public void CanBuildSimpleMsiPackage()
         {
-            var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
+            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
 
             using (var fs = new DisposableFileSystem())
             {
                 var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
-                var engine = new FakeBuildEngine();
+                var result = this.MsbuildRunner.Execute(projectPath, new[] 
+                {
+                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:IntermediateOutputPath={intermediateFolder}",
+                    $"-p:OutputPath={binFolder}"
+                });
+                result.AssertSuccess();
 
-                var task = new DoIt
+                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .OrderBy(s => s)
+                    .ToArray();
+                Assert.Equal(new[]
                 {
-                    BuildEngine = engine,
-                    SourceFiles = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "Package.wxs")),
-                        new TaskItem(Path.Combine(folder, "PackageComponents.wxs")),
-                    },
-                    LocalizationFiles = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "Package.en-us.wxl")),
-                    },
-                    BindInputPaths = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "data")),
-                    },
-                    IntermediateDirectory = new TaskItem(intermediateFolder),
-                    OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")),
-                };
-
-                var result = task.Execute();
-                Assert.True(result, $"MSBuild task failed unexpectedly. Output:\r\n{engine.Output}");
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\cab1.cab")));
-
-                var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wir"));
-                var section = intermediate.Sections.Single();
-
-                var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+                    @"bin\en-US\cab1.cab",
+                    @"bin\en-US\MsiPackage.msi",
+                    @"bin\en-US\MsiPackage.wixpdb",
+                }, paths);
+            }
+        }
+
+        [Fact]
+        public void CanBuildAndCleanSimpleMsiPackage()
+        {
+            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
+
+                // Build
+                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                {
+                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:IntermediateOutputPath={intermediateFolder}",
+                    $"-p:OutputPath={binFolder}",
+                    "-v:diag"
+                });
+                result.AssertSuccess();
+
+                var buildOutput = String.Join("\r\n", result.Output);
+
+                var createdPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories)
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .OrderBy(s => s)
+                    .ToArray();
+                Assert.NotEmpty(createdPaths);
+
+                // Clean
+                result = this.MsbuildRunner.Execute(projectPath, new[]
+                {
+                    $"-p:WixTargetsPath={WixTargetsPath}",
+                    $"-p:IntermediateOutputPath={intermediateFolder}",
+                    $"-p:OutputPath={binFolder}",
+                    "-t:Clean",
+                    "-v:diag"
+                });
+                result.AssertSuccess();
+
+                var cleanOutput = String.Join("\r\n", result.Output);
+
+                var remainingPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories)
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .OrderBy(s => s)
+                    .ToArray();
+                Assert.Empty(remainingPaths);
             }
         }
     }
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
index 31c3ec9c..d5cac8d8 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-    <OutputName>MsiPackage</OutputName>
-    <OutputType>Package</OutputType>
-    <Name>MsiPackage</Name>
-    <RootNamespace>MsiPackage</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
-    <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\wix.targets</WixTargetsPath>
+    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -48,8 +42,8 @@
   </ItemGroup>
 
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
+  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
+    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
new file mode 100644
index 00000000..c4a69cdd
--- /dev/null
+++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -0,0 +1,64 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BuildTasks
+{
+    using System.IO;
+    using System.Linq;
+    using Microsoft.Build.Utilities;
+    using WixBuildTools.TestSupport;
+    using WixToolset.BuildTasks;
+    using WixToolset.Data;
+    using WixToolset.Data.Tuples;
+    using Xunit;
+
+    public class WixBuildTaskFixture
+    {
+        [Fact]
+        public void CanBuildSimpleMsiPackage()
+        {
+            var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var engine = new FakeBuildEngine();
+
+                var task = new DoIt
+                {
+                    BuildEngine = engine,
+                    SourceFiles = new[]
+                    {
+                        new TaskItem(Path.Combine(folder, "Package.wxs")),
+                        new TaskItem(Path.Combine(folder, "PackageComponents.wxs")),
+                    },
+                    LocalizationFiles = new[]
+                    {
+                        new TaskItem(Path.Combine(folder, "Package.en-us.wxl")),
+                    },
+                    BindInputPaths = new[]
+                    {
+                        new TaskItem(Path.Combine(folder, "data")),
+                    },
+                    IntermediateDirectory = new TaskItem(intermediateFolder),
+                    OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")),
+                };
+
+                var result = task.Execute();
+                Assert.True(result, $"MSBuild task failed unexpectedly. Output:\r\n{engine.Output}");
+
+                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
+                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
+                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\cab1.cab")));
+
+                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
+                var section = intermediate.Sections.Single();
+
+                var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+            }
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 99da83cd..edab8a67 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />