Fix Build and Clean targets

7 files changed, 256 insertions, 227 deletions

diff --git a/src/WixToolset.BuildTasks/wix.signing.targets b/src/WixToolset.BuildTasks/wix.signing.targets
index 6351cc8b..7c25175f 100644
--- a/src/WixToolset.BuildTasks/wix.signing.targets
+++ b/src/WixToolset.BuildTasks/wix.signing.targets
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- These properties can be overridden to support non-default installations. -->
   <PropertyGroup>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileFullPath)</WixTargetsPath>
-    <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixTargetsPath)WixTasks.dll</WixTasksPath>
-
-    <SignedFile Condition=" '$(SignedFile)' == '' ">$(MSBuildProjectFile).Signed.txt</SignedFile>
+    <SignedFileName Condition=" '$(SignedFileName)' == '' ">$(MSBuildProjectFile).Signed.txt</SignedFileName>
+    <SignedFilePath>$(IntermediateOutputPath)$(SignedFileName)</SignedFilePath>
   </PropertyGroup>
 
   <UsingTask TaskName="Insignia" AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="GetCabList" AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="GetLooseFileList" AssemblyFile="$(WixTasksPath)" />
 
   <!-- Default Inscribe properties. -->
   <PropertyGroup>
@@ -51,49 +48,57 @@
     </InternalSignDependsOn>
 
     <SigningDependsOn>
-      CompileAndLink;
+      WixBuild;
+      CalculateSignTargetFiles;
       BeforeSigning;
       $(InternalSignDependsOn);
       AfterSigning
     </SigningDependsOn>
   </PropertyGroup>
   <Target
-    Name="Signing"
-    DependsOnTargets="$(SigningDependsOn)"
-    Inputs="@(SignTargetPath)"
-    Outputs="$(IntermediateOutputPath)$(SignedFile)"
-    Condition=" '@(SignTargetPath)' != '' ">
+      Name="Signing"
+      DependsOnTargets="$(SigningDependsOn)"
+      Inputs="$(TargetPath)"
+      Outputs="$(SignedFilePath)"
+      Condition=" '$(SignOutput)' == 'true' ">
 
-    <CreateItem Include="$(IntermediateOutputPath)$(SignedFile)">
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
+    <ItemGroup>
+      <FileWrites Include="$(SignedFilePath)" />
+    </ItemGroup>
 
     <WriteLinesToFile
-        File="$(IntermediateOutputPath)$(SignedFile)"
-        Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
-        Overwrite="true" />
+      File="$(SignedFilePath)"
+      Lines="^$(MSBuildProjectFullPath);@(SignMsm);@(SignCabs);@(SignMsi);@(SignContainers);@(SignBundleEngine);@(SignBundle)"
+      Overwrite="true" />
   </Target>
 
   <!-- Internal targets so correct signing targets are called. -->
   <Target
+      Name="CalculateSignTargetFiles">
+    <ItemGroup>
+      <SignTargetPath Include="$(TargetPath)" />
+    </ItemGroup>
+  </Target>
+
+  <Target
       Name="GetMsmsToSign"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
-    <CreateItem Include="@(SignTargetPath)">
-      <Output TaskParameter="Include" ItemName="SignMsm" />
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
+      Outputs="$(SignedFilePath)">
+
+    <ItemGroup>
+      <SignMsm Include="@(SignTargetPath)" />
+    </ItemGroup>
   </Target>
 
   <Target
-    Name="InternalSignMsm"
-    DependsOnTargets="SignMsm"
-    Condition=" '@(SignMsm)' != '' " />
+      Name="InternalSignMsm"
+      DependsOnTargets="SignMsm"
+      Condition=" '@(SignMsm)' != '' " />
 
   <Target
       Name="GetCabsToSign"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
+      Outputs="$(SignedFilePath)">
     <GetCabList Database="%(SignTargetPath.FullPath)">
       <Output TaskParameter="CabList" ItemName="SignCabs" />
       <Output TaskParameter="CabList" ItemName="FileWrites" />
@@ -101,14 +106,14 @@
   </Target>
 
   <Target
-    Name="InternalSignCabs"
-    DependsOnTargets="SignCabs"
-    Condition=" '@(SignCabs)' != '' " />
+      Name="InternalSignCabs"
+      DependsOnTargets="SignCabs"
+      Condition=" '@(SignCabs)' != '' " />
 
   <Target
       Name="GetMsiToSign"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
+      Outputs="$(SignedFilePath)">
     <CreateItemAvoidingInference InputProperties="@(SignTargetPath)">
       <Output TaskParameter="OuputItems" ItemName="SignMsi" />
       <Output TaskParameter="OuputItems" ItemName="FileWrites" />
@@ -116,33 +121,33 @@
   </Target>
 
   <Target
-    Name="InternalSignMsi"
-    DependsOnTargets="SignMsi"
-    Inputs="@(SignTargetPath)"
-    Outputs="$(IntermediateOutputPath)$(SignedFile)"
-    Condition=" '@(SignMsi)' != '' " />
+      Name="InternalSignMsi"
+      DependsOnTargets="SignMsi"
+      Inputs="@(SignTargetPath)"
+      Outputs="$(SignedFilePath)"
+      Condition=" '@(SignMsi)' != '' " />
 
   <Target
       Name="GetContainersToSign"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
+      Outputs="$(SignedFilePath)">
     <!-- TODO: implement signing detached containers -->
   </Target>
 
   <Target
-    Name="InternalSignContainers"
-    DependsOnTargets="SignContainers"
-    Condition=" '@(SignContainers)' != '' " />
+      Name="InternalSignContainers"
+      DependsOnTargets="SignContainers"
+      Condition=" '@(SignContainers)' != '' " />
 
   <Target
-    Name="InternalSignBundleEngine"
-    DependsOnTargets="SignBundleEngine"
-    Condition=" '@(SignBundleEngine)' != '' " />
+      Name="InternalSignBundleEngine"
+      DependsOnTargets="SignBundleEngine"
+      Condition=" '@(SignBundleEngine)' != '' " />
 
   <Target
-    Name="InternalSignBundle"
-    DependsOnTargets="SignBundle"
-    Condition=" '@(SignBundle)' != '' " />
+      Name="InternalSignBundle"
+      DependsOnTargets="SignBundle"
+      Condition=" '@(SignBundle)' != '' " />
 
   <!--
   ================================================================================================
@@ -160,17 +165,13 @@
   -->
   <PropertyGroup>
     <InscribeMsiDependsOn>
-      PrepareForBuild;
-      ResolveWixExtensionReferences;
-      CompileAndLink;
-      InternalSignCabs
     </InscribeMsiDependsOn>
   </PropertyGroup>
   <Target
       Name="InscribeMsi"
       DependsOnTargets="$(InscribeMsiDependsOn)"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)"
+      Outputs="$(SignedFilePath)"
       Condition=" '@(SignCabs)' != '' ">
 
     <Insignia
@@ -203,17 +204,13 @@
   -->
   <PropertyGroup>
     <InscribeBundleEngineDependsOn>
-      PrepareForBuild;
-      ResolveWixExtensionReferences;
-      CompileAndLink;
-      InternalSignContainers
     </InscribeBundleEngineDependsOn>
   </PropertyGroup>
   <Target
       Name="InscribeBundleEngine"
       DependsOnTargets="$(InscribeBundleEngineDependsOn)"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
+      Outputs="$(SignedFilePath)">
 
     <Insignia
         BundleFile="@(SignTargetPath)"
@@ -230,11 +227,10 @@
       <Output TaskParameter="Output" ItemName="SignBundleEngine" />
     </Insignia>
 
-    <!-- Explicitly add output to FileWrites to ensure even when the target is up to date. -->
-    <CreateItem Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)">
-      <Output TaskParameter="Include" ItemName="FileWrites" />
-    </CreateItem>
-
+    <!-- Explicitly add output to FileWrites to ensure they are included even when the target is up to date. -->
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)%(SignTargetPath.Filename)%(SignTargetPath.Extension)" />
+    </ItemGroup>
   </Target>
 
   <!--
@@ -252,17 +248,13 @@
   -->
   <PropertyGroup>
     <InscribeBundleDependsOn>
-      PrepareForBuild;
-      ResolveWixExtensionReferences;
-      CompileAndLink;
-      InternalSignBundleEngine
     </InscribeBundleDependsOn>
   </PropertyGroup>
   <Target
       Name="InscribeBundle"
       DependsOnTargets="$(InscribeBundleDependsOn)"
       Inputs="@(SignTargetPath)"
-      Outputs="$(IntermediateOutputPath)$(SignedFile)">
+      Outputs="$(SignedFilePath)">
 
     <Insignia
         BundleFile="@(SignBundleEngine)"
diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets
index ebd3fa90..da90226d 100644
--- a/src/WixToolset.BuildTasks/wix.targets
+++ b/src/WixToolset.BuildTasks/wix.targets
@@ -48,14 +48,13 @@
   <PropertyGroup>
     <DefaultLanguageSourceExtension>.wxs</DefaultLanguageSourceExtension>
     <Language>wix</Language>
-    <TargetRuntime>Managed</TargetRuntime>
+    <TargetRuntime>wix</TargetRuntime>
 
     <!-- Use OutputName to set the AssemblyName for Microsoft.Common.targets -->
     <OutputName Condition=" '$(OutputName)'=='' ">$(MSBuildProjectName)</OutputName>
     <AssemblyName>$(OutputName)</AssemblyName>
 
-    <!-- Default the OutputType to a known WiX toolset TYPE.  -->
-    <_OriginalOutputType>$(OutputType)</_OriginalOutputType>
+    <!-- Default the OutputType to a known WiX Toolset type.  -->
     <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType>
   </PropertyGroup>
 
@@ -70,28 +69,24 @@
     <TargetExt Condition=" '$(OutputType)' == 'PatchCreation' ">.pcp</TargetExt>
     <TargetExt Condition=" '$(OutputType)' == 'Library' ">.wixlib</TargetExt>
     <TargetExt Condition=" '$(OutputType)' == 'Bundle' ">.exe</TargetExt>
+    <TargetExt Condition=" '$(OutputType)' == 'IntermediatePostLink' ">.wixipl</TargetExt>
   </PropertyGroup>
 
-  <!-- Provide the correct output name for the .wixpdb -->
-  <ItemGroup Condition="'$(_DebugSymbolsProduced)' == 'true'">
-    <_DebugSymbolsIntermediatePath Include="$(PdbOutputDir)$(TargetPdbName)" Condition=" '@(_DebugSymbolsIntermediatePath)' == '' " />
-  </ItemGroup>
-
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 
   <PropertyGroup>
     <!-- Default pdb output path to the intermediate output directory -->
-    <PdbOutputDir Condition=" '$(PdbOutputDir)'=='' ">$(IntermediateOutputPath)</PdbOutputDir>
-    <PdbOutputDir Condition=" '$(PdbOutputDir)' != '' and !HasTrailingSlash('$(PdbOutputDir)') ">$(PdbOutputDir)\</PdbOutputDir>
+    <PdbOutputDir Condition=" '$(PdbOutputDir)'=='' ">$(TargetDir)</PdbOutputDir>
+    <PdbOutputDir Condition=" !HasTrailingSlash('$(PdbOutputDir)') ">$(PdbOutputDir)\</PdbOutputDir>
 
     <!-- Example, C:\MyProjects\MyProject\bin\debug\ -->
     <TargetPdbDir Condition=" '$(PdbOutputDir)'!='' ">$([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputDir)`))`))</TargetPdbDir>
 
     <!-- Example, MySetup.wixpdb" -->
-    <TargetPdbName Condition=" '$(TargetPdbName)' == '' ">$(TargetName).wixpdb</TargetPdbName>
+    <TargetPdbFileName Condition=" '$(TargetPdbFileName)' == '' ">$(TargetName).wixpdb</TargetPdbFileName>
 
     <!-- Example, C:\MyProjects\MyProject\bin\debug\MyPackage.wixpdb -->
-    <TargetPdbPath Condition=" '$(TargetPdbPath)' == '' ">$(TargetPdbDir)$(TargetPdbName)</TargetPdbPath>
+    <TargetPdbPath Condition=" '$(TargetPdbPath)' == '' ">$(TargetPdbDir)$(TargetPdbFileName)</TargetPdbPath>
   </PropertyGroup>
 
   <!--
@@ -111,8 +106,6 @@
   <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="ResolveWixReferences" AssemblyFile="$(WixTasksPath)"/>
   <UsingTask TaskName="ReplaceString" AssemblyFile="$(WixTasksPath)"/>
-  <UsingTask TaskName="GetCabList" AssemblyFile="$(WixTasksPath)" />
-  <UsingTask TaskName="GetLooseFileList" AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="GenerateCompileWithObjectPath" AssemblyFile="$(WixTasksPath)"/>
 
   <PropertyGroup>
@@ -131,14 +124,6 @@
   </PropertyGroup>
 
   <!--
-  Set the SignTargetPath item directly when output is a Bundle. The AssignCultures target
-  sets SignTargetPath item for other output types based on the cultures provided.
-  -->
-  <ItemGroup>
-    <SignTargetPath Include="$(TargetPath)" Condition=" '$(OutputType)' == 'Bundle' AND '$(SignOutput)' == 'true' AND '$(SuppressLayout)' != 'true' " />
-  </ItemGroup>
-
-  <!--
   //////////////////////////////////////////////////////////////////////////////////////////////////
   //////////////////////////////////////////////////////////////////////////////////////////////////
   Default Compiler, Linker, and Librarian Property Declarations
@@ -219,32 +204,27 @@
 
     [IN]
     $(OutputName) - The name of the MSI/MSM/wixlib to build (without the extension)
-    $(OutputType) - Possible values are 'package', 'PatchCreation', 'module', 'library', 'bundle'
+    $(OutputType) - Possible values are 'Package', 'PatchCreation', 'Module', 'Library', 'Bundle', 'IntermediatePostLink'
   ==================================================================================================
   -->
   <PropertyGroup>
     <_PleaseSetThisInProjectFile>Please set this in the project file before the &lt;Import&gt; of the wix.targets file.</_PleaseSetThisInProjectFile>
-    <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), PatchCreation (.pcp), merge module (.msm), wix library (.wixlib), or self-extracting executable (.exe) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', 'Library', and 'Bundle'.</_OutputTypeDescription>
+    <_OutputTypeDescription>Possible values are: 'Package', 'Module', 'Library', 'Bundle', 'IntermediatePostLink'. $(_PleaseSetThisInProjectFile)</_OutputTypeDescription>
   </PropertyGroup>
   <Target Name="_CheckRequiredProperties">
 
     <Error
-      Code="WIXTARGETS100"
+      Code="WIX100"
       Condition=" '$(OutputName)' == '' "
       Text="The OutputName property is not set in project &quot;$(MSBuildProjectFile)&quot;. The OutputName defines the name of the output without a file extension. $(_PleaseSetThisInProjectFile)" />
 
-    <Warning
-      Code="WIXTARGETS101"
-      Condition=" '$(_OriginalOutputType)' == '' "
-      Text="The OutputType property is not set in project &quot;$(MSBuildProjectFile)&quot;. Defaulting to '$(OutputType)'. $(_OutputTypeDescription)" />
-
     <Error
-      Code="WIXTARGETS102"
-      Condition=" '$(OutputType)' != 'Package' and '$(OutputType)' != 'PatchCreation' and '$(OutputType)' != 'Module' and '$(OutputType)' != 'Library' and '$(OutputType)' != 'Bundle' "
+      Code="WIX101"
+      Condition=" '$(OutputType)' != 'Package' and '$(OutputType)' != 'PatchCreation' and '$(OutputType)' != 'Module' and '$(OutputType)' != 'Library' and '$(OutputType)' != 'Bundle' and '$(OutputType)' != 'IntermediatePostLink' "
       Text="The OutputType property '$(OutputType)' is not valid in project &quot;$(MSBuildProjectFile)&quot;. $(_OutputTypeDescription)" />
 
     <Error
-      Code="WIXTARGETS103"
+      Code="WIX102"
       Condition=" '$(MSBuildToolsVersion)' == '' OR '$(MSBuildToolsVersion)' &lt; '4.0' "
       Text="MSBuild v$(MSBuildToolsVersion) is not supported by the project &quot;$(MSBuildProjectFile)&quot;. You must use MSBuild v4.0 or later." />
 
@@ -272,7 +252,6 @@
       BuildOnlySettings;
       PrepareForBuild;
       PreBuildEvent;
-      ResolveReferences;
 
       WixBuild;
       Signing;
@@ -580,7 +559,7 @@
   ================================================================================================
   -->
   <PropertyGroup>
-    <GetTargetPathDependsOn>AssignCultures</GetTargetPathDependsOn>
+    <GetTargetPathDependsOn>AssignTargetPaths</GetTargetPathDependsOn>
   </PropertyGroup>
 
 
@@ -600,22 +579,22 @@
   <PropertyGroup>
     <WixBuildDependsOn>
       ResolveReferences;
-      BeforeWixBuild;
-      _TimeStampBeforeWixBuild;
+      BeforeCompile;
+      _TimeStampBeforeCompile;
 
       CalculateDefineConstants;
       Harvest;
 
       GenerateCompileWithObjectPath;
 
-      AssignCultures;
+      AssignTargetPaths;
       ReadPreviousBindInputsAndBuiltOutputs;
 
       CoreWixBuild;
 
       UpdateLinkFileWrites;
-      _TimeStampAfterWixBuild;
-      AfterWixBuild
+      _TimeStampAfterCompile;
+      AfterCompile
     </WixBuildDependsOn>
   </PropertyGroup>
   <Target
@@ -623,23 +602,24 @@
     DependsOnTargets="$(WixBuildDependsOn)" />
 
   <Target
-    Name="CoreWixBuild"
-
-    Inputs="@(Compile);
-    @(Content);
-    @(EmbeddedResource);
-    @(WixObject);
-    @(_ResolvedProjectReferencePaths);
-    @(_ResolvedWixLibraryPaths);
-    @(_ResolvedWixExtensionPaths);
-    @(_BindInputs);
-    $(MSBuildAllProjects)"
-    Outputs="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile);@(_BindBuiltOutputs)"
-    Condition=" '@(Compile)' != '' ">
+      Name="CoreWixBuild"
+      Inputs="@(Compile);
+      @(Content);
+      @(EmbeddedResource);
+      @(WixObject);
+      @(_ResolvedProjectReferencePaths);
+      @(_ResolvedWixLibraryPaths);
+      @(_ResolvedWixExtensionPaths);
+      @(_BindInputs);
+      $(MSBuildAllProjects)"
+      Outputs="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile);@(_BindBuiltOutputs)"
+      Condition=" '@(Compile)' != '' ">
 
     <PropertyGroup>
-      <OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)))</OutputFile>
-      <PdbOutputFile>$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbName)</PdbOutputFile>
+      <!--<OutputFile>$([System.IO.Path]::GetFullPath($(TargetDir)%(CultureGroup.OutputFolder)$(TargetFileName)))</OutputFile>-->
+      <OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)))</OutputFile>
+      <!--<OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)))</OutputFile>-->
+      <PdbOutputFile>$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)</PdbOutputFile>
     </PropertyGroup>
 
     <DoIt
@@ -780,7 +760,7 @@
 
   <!--
   ================================================================================================
-  AssignCultures
+  AssignTargetPaths - OVERRIDE Target
 
     Determines the final list of culture groups to build based on either the Cultures property or
     those specified in .wxl files.
@@ -811,37 +791,27 @@
     @(CultureGroup) - The list of culture group strings with OutputFolder metadata
     $(TargetPath) - Property list of target link output MSIs/MSMs
     $(TargetPdbPath) - Property list of target output pdbs
-    @(SignTargetPath) - The list of target to be signed
 
   ================================================================================================
   -->
   <Target
-      Name="AssignCultures"
+      Name="AssignTargetPaths"
       Condition=" '$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module' ">
 
-    <WixAssignCulture
-        Cultures="$(Cultures)"
-        Files="@(EmbeddedResource)">
-
+    <WixAssignCulture Cultures="$(Cultures)" Files="@(EmbeddedResource)">
       <Output TaskParameter="CultureGroups" ItemName="CultureGroup" />
     </WixAssignCulture>
 
-    <!-- Build an itemgroup of outputs -->
+    <!-- Expand the culture groups then put them back into the appropriate property -->
     <ItemGroup>
-      <_TargetPathItems Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetName)$(TargetExt)" />
-      <_TargetPdbPathItems Include="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbName)" />
+      <_CulturedTargetPath Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetFileName)" />
+      <_CulturedTargetPdbPath Include="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" />
     </ItemGroup>
 
-    <!-- Convert the itemgroup to a semicolon-delimited property -->
     <PropertyGroup>
-      <TargetPath>@(_TargetPathItems)</TargetPath>
-      <TargetPdbPath>@(_TargetPdbPathItems)</TargetPdbPath>
+      <TargetPath>@(_CulturedTargetPath)</TargetPath>
+      <TargetPdbPath>@(_CulturedTargetPdbPath)</TargetPdbPath>
     </PropertyGroup>
-
-    <!-- Set the sign target items, if we're signing output. -->
-    <ItemGroup Condition=" '$(SignOutput)' == 'true' AND '$(SuppressLayout)' != 'true' ">
-      <SignTargetPath Include="@(_TargetPathItems)" />
-    </ItemGroup>
   </Target>
 
   <!--
@@ -957,7 +927,7 @@
   ==================================================================================================
   -->
   <PropertyGroup>
-    <BuiltProjectOutputGroupDependsOn>PrepareForBuild;AssignCultures</BuiltProjectOutputGroupDependsOn>
+    <BuiltProjectOutputGroupDependsOn>PrepareForBuild;AssignTargetPaths</BuiltProjectOutputGroupDependsOn>
   </PropertyGroup>
   <Target
     Name="BuiltProjectOutputGroup"
@@ -967,7 +937,7 @@
     <!-- Don't add BuiltProjectOutputGroupKeyOutput - to avoid duplicates, we only want to get the updated list of TargetPaths from the TargetPath property below -->
 
     <!-- Try to read the outputs from the bind outputs text file since that's the output list straight from linker. -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)">
+    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)">
       <Output TaskParameter="Lines" ItemName="_BuiltProjectOutputGroupOutputIntermediate"/>
     </ReadLinesFromFile>
 
@@ -993,14 +963,14 @@
   ==================================================================================================
   -->
   <PropertyGroup>
-    <DebugSymbolsProjectOutputGroupDependsOn>AssignCultures</DebugSymbolsProjectOutputGroupDependsOn>
+    <DebugSymbolsProjectOutputGroupDependsOn>AssignTargetPaths</DebugSymbolsProjectOutputGroupDependsOn>
   </PropertyGroup>
   <Target
     Name="DebugSymbolsProjectOutputGroup"
     Outputs="@(DebugSymbolsProjectOutputGroupOutput)"
     DependsOnTargets="$(DebugSymbolsProjectOutputGroupDependsOn)">
 
-    <!-- Include build output pdb(s).  Different than predefined itemgroup since AssignCultures target may change -->
+    <!-- Include build output pdb(s).  Different than predefined itemgroup since AssignTargetPaths target may change -->
     <ItemGroup>
       <DebugSymbolsProjectOutputGroupOutput Include="$(TargetPdbPath)" Condition=" '$(SuppressPdbOutput)' != 'true' "/>
     </ItemGroup>
@@ -1029,7 +999,7 @@
     </PropertyGroup>
 
     <!-- Copy the bound files. -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)">
+    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)">
       <Output TaskParameter="Lines" ItemName="_FullPathToCopy"/>
     </ReadLinesFromFile>
 
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" />