Normalize ToolsetTask implementation to call wix.exe and heat.exe

Share the ToolsetTask implementation that can find .NET Core and
.NET Framework with multiple architectures.

Fixes 6951

9 files changed, 110 insertions, 0 deletions

diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs b/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
new file mode 100644
index 00000000..cea86733
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
+
+    <StandardDirectory Id='ProgramFiles6432Folder'>
+      <Directory Id='ApplicationFolder' Name='Test App' />
+    </StandardDirectory>
+
+    <Feature Id='Main'>
+      <ComponentGroupRef Id='HarvestedComponents' />
+    </Feature>
+  </Package>
+</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj b/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
new file mode 100644
index 00000000..c4255246
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
@@ -0,0 +1,21 @@
+<!-- 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 Sdk='WixToolset.Sdk'> 
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <SuppressValidation>true</SuppressValidation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="_data">
+      <ComponentGroupName>HarvestedComponents</ComponentGroupName>
+      <DirectoryRefId>ApplicationFolder</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+    <BindInputPaths Include="_data" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Wixtoolset.Heat" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt b/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
new file mode 100644
index 00000000..71b864af
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
@@ -0,0 +1 @@
+This is a.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt b/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
new file mode 100644
index 00000000..78eb1cc6
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
@@ -0,0 +1 @@
+This is b.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs b/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
new file mode 100644
index 00000000..cea86733
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
+
+    <StandardDirectory Id='ProgramFiles6432Folder'>
+      <Directory Id='ApplicationFolder' Name='Test App' />
+    </StandardDirectory>
+
+    <Feature Id='Main'>
+      <ComponentGroupRef Id='HarvestedComponents' />
+    </Feature>
+  </Package>
+</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj b/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
new file mode 100644
index 00000000..3df9c9d4
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
@@ -0,0 +1,30 @@
+<!-- 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 Sdk='WixToolset.Sdk'> 
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <SuppressValidation>true</SuppressValidation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <BindInputPaths Include="_data" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Wixtoolset.Heat" />
+  </ItemGroup>
+
+  <Target Name="ManualHarvest" BeforeTargets="BeforeBuild">
+    <HeatDirectory
+      Directory="_data"
+      AutogenerateGuids="true"
+      ComponentGroupName="HarvestedComponents"
+      DirectoryRefId="ApplicationFolder"
+      OutputFile="obj\_g.wxs"
+      />
+    <ItemGroup>
+      <Compile Include="obj\_g.wxs" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt b/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
new file mode 100644
index 00000000..71b864af
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
@@ -0,0 +1 @@
+This is a.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt b/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt
new file mode 100644
index 00000000..78eb1cc6
--- /dev/null
+++ b/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt
@@ -0,0 +1 @@
+This is b.txt.
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index b1c6b2de..5574680f 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -115,6 +115,32 @@ namespace WixE2E
             Assert.NotEqual(firstHashes, secondHashes);
         }
 
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CanBuildPackageWithHarvesting(bool x64)
+        {
+            var projectPath = TestData.Get("TestData", "WixprojPackageHarvesting", "WixprojPackageHarvesting.wixproj");
+
+            CleanEverything();
+
+            var result = RestoreAndBuild(projectPath, x64);
+            result.AssertSuccess();
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CanBuildPackageWithHeatDir(bool x64)
+        {
+            var projectPath = TestData.Get("TestData", "WixprojPackageHeatDir", "WixprojPackageHeatDir.wixproj");
+
+            CleanEverything();
+
+            var result = RestoreAndBuild(projectPath, x64);
+            result.AssertSuccess();
+        }
+
         [Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
         public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
         {
@@ -161,6 +187,11 @@ namespace WixE2E
                     }
                 }
             }
+
+            foreach (var logFile in Directory.GetFiles(rootFolder, "*.binlog", SearchOption.AllDirectories))
+            {
+                File.Delete(logFile);
+            }
         }
 
         private static string GetFileHash(string path)