Update heat to use StandardDirectory element

Fixes 6631

4 files changed, 153 insertions, 15 deletions

diff --git a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
new file mode 100644
index 00000000..befcedcc
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
@@ -0,0 +1,136 @@
+// 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.Heat
+{
+    using System.IO;
+    using System.Linq;
+    using WixBuildTools.TestSupport;
+    using Xunit;
+
+    public class HeatFixture
+    {
+        [Fact]
+        public void CanHarvestSimpleDirectory()
+        {
+            var folder = TestData.Get("TestData", "SingleFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var outputPath = Path.Combine(fs.GetFolder(), "out.wxs");
+
+                var args = new[]
+                {
+                    "dir", folder,
+                    "-o", outputPath
+                };
+
+                var result = HeatRunner.Execute(args);
+                result.AssertSuccess();
+
+                var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "<?xml version='1.0' encoding='utf-8'?>",
+                    "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                    "    <Fragment>",
+                    "        <StandardDirectory Id='TARGETDIR'>",
+                    "            <Directory Id='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8' Name='SingleFile' />",
+                    "        </StandardDirectory>",
+                    "    </Fragment>",
+                    "    <Fragment>",
+                    "        <DirectoryRef Id='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8'>",
+                    "            <Component Id='cmp0i3dThrp4nheCteEmXvHxBDa_VE' Guid='PUT-GUID-HERE'>",
+                    "                <File Id='filziMcXYgrmcbVF8PuTUfIB9Vgqo0' KeyPath='yes' Source='SourceDir\\a.txt' />",
+                    "            </Component>",
+                    "        </DirectoryRef>",
+                    "    </Fragment>",
+                    "</Wix>",
+                }, wxs);
+            }
+        }
+
+        [Fact]
+        public void CanHarvestSimpleDirectoryToInstallFolder()
+        {
+            var folder = TestData.Get("TestData", "SingleFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var outputPath = Path.Combine(fs.GetFolder(), "out.wxs");
+
+                var args = new[]
+                {
+                    "dir", folder,
+                    "-dr", "INSTALLFOLDER",
+                    "-o", outputPath
+                };
+
+                var result = HeatRunner.Execute(args);
+                result.AssertSuccess();
+
+                var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "<?xml version='1.0' encoding='utf-8'?>",
+                    "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                    "    <Fragment>",
+                    "        <DirectoryRef Id='INSTALLFOLDER'>",
+                    "            <Directory Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE' Name='SingleFile' />",
+                    "        </DirectoryRef>",
+                    "    </Fragment>",
+                    "    <Fragment>",
+                    "        <DirectoryRef Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE'>",
+                    "            <Component Id='cmpxHVF6oXohc0EWgRphmYZvw5.GGU' Guid='PUT-GUID-HERE'>",
+                    "                <File Id='filk_7KUAfL4VfzxSRsGFf_XOBHln0' KeyPath='yes' Source='SourceDir\\a.txt' />",
+                    "            </Component>",
+                    "        </DirectoryRef>",
+                    "    </Fragment>",
+                    "</Wix>",
+                }, wxs);
+            }
+        }
+
+        [Fact]
+        public void CanHarvestFile()
+        {
+            var folder = TestData.Get("TestData", "SingleFile");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var outputPath = Path.Combine(fs.GetFolder(), "out.wxs");
+
+                var args = new[]
+                {
+                    "file", Path.Combine(folder, "a.txt"),
+                    "-cg", "GroupA",
+                    "-dr", "ProgramFiles6432Folder",
+                    "-o", outputPath
+
+                };
+
+                var result = HeatRunner.Execute(args);
+                result.AssertSuccess();
+
+                var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "<?xml version='1.0' encoding='utf-8'?>",
+                    "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                    "    <Fragment>",
+                    "        <StandardDirectory Id='ProgramFiles6432Folder'>",
+                    "            <Directory Id='dirl6r_Yc0gvMUEUVe5rioOOIIasoU' Name='SingleFile' />",
+                    "        </StandardDirectory>",
+                    "    </Fragment>",
+                    "    <Fragment>",
+                    "        <ComponentGroup Id='GroupA'>",
+                    "            <Component Id='cmpfBcW61_XzosRWK3EzUTBtJrcJD8' Directory='dirl6r_Yc0gvMUEUVe5rioOOIIasoU' Guid='PUT-GUID-HERE'>",
+                    "                <File Id='filKrZgaIOSKpNZXFnezZc9X.LKGpw' KeyPath='yes' Source='SourceDir\\SingleFile\\a.txt' />",
+                    "            </Component>",
+                    "        </ComponentGroup>",
+                    "    </Fragment>",
+                    "</Wix>",
+                }, wxs);
+            }
+        }
+    }
+}
diff --git a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
index d8b6b39a..c914dcac 100644
--- a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
+++ b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
@@ -1,17 +1,14 @@
 // 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.Harvesters
+namespace WixToolsetTest.Heat
 {
-    using System;
     using System.Collections.Generic;
-    using System.Threading;
     using System.Threading.Tasks;
     using WixToolset.Core;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
-    using WixToolset.Harvesters;
+    using WixToolset.Tools.Heat;
 
     /// <summary>
     /// Utility class to emulate heat.exe.
@@ -66,8 +63,6 @@ namespace WixToolsetTest.Harvesters
         /// <returns></returns>
         public static Task<int> Execute(string[] args, IWixToolsetCoreServiceProvider coreProvider, out List<Message> messages, bool warningsAsErrors = true)
         {
-            coreProvider.AddBundleBackend();
-
             var listener = new TestMessageListener();
 
             messages = listener.Messages;
@@ -80,12 +75,8 @@ namespace WixToolsetTest.Harvesters
                 messaging.WarningsAsError = true;
             }
 
-            var arguments = coreProvider.GetService<ICommandLineArguments>();
-            arguments.Populate(args);
-
-            var commandLine = HeatCommandLineFactory.CreateCommandLine(coreProvider);
-            var command = commandLine.ParseStandardCommandLine(arguments);
-            return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1);
+            var program = new Program();
+            return program.Run(coreProvider, listener, args);
         }
     }
 }
diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt b/src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt
new file mode 100644
index 00000000..4410bb5e
--- /dev/null
+++ b/src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt
@@ -0,0 +1 @@
+This is a.txt
diff --git a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
index 73eb078c..c887297b 100644
--- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+++ b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
@@ -3,13 +3,23 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
+    <DebugType>embedded</DebugType>
+    <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
     <SignOutput>false</SignOutput>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixBuildTools.TestSupport" />
+    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\heat\heat.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
 
   <ItemGroup>