Simplify heat by creating a single executable

7 files changed, 198 insertions, 0 deletions

diff --git a/src/test/WixToolsetTest.Heat/HeatRunner.cs b/src/test/WixToolsetTest.Heat/HeatRunner.cs
new file mode 100644
index 00000000..287698a9
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/HeatRunner.cs
@@ -0,0 +1,92 @@
+// 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
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using WixToolset.Core;
+    using WixToolset.Core.Burn;
+    using WixToolset.Core.TestPackage;
+    using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
+    using WixToolset.Harvesters;
+
+    /// <summary>
+    /// Utility class to emulate heat.exe.
+    /// </summary>
+    public static class HeatRunner
+    {
+        /// <summary>
+        /// Emulates calling heat.exe.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <param name="messages"></param>
+        /// <param name="warningsAsErrors"></param>
+        /// <returns></returns>
+        public static int Execute(string[] args, out List<Message> messages, bool warningsAsErrors = true)
+        {
+            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
+            var task = Execute(args, serviceProvider, out messages, warningsAsErrors: warningsAsErrors);
+            return task.Result;
+        }
+
+        /// <summary>
+        /// Emulates calling wix.exe with standard backends.
+        /// This overload always treats warnings as errors.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        public static WixRunnerResult Execute(params string[] args)
+        {
+            return Execute(true, args);
+        }
+
+        /// <summary>
+        /// Emulates calling wix.exe with standard backends.
+        /// </summary>
+        /// <param name="warningsAsErrors"></param>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        public static WixRunnerResult Execute(bool warningsAsErrors, params string[] args)
+        {
+            var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
+            var exitCode = Execute(args, serviceProvider, out var messages, warningsAsErrors: warningsAsErrors);
+            return new WixRunnerResult { ExitCode = exitCode.Result, Messages = messages.ToArray() };
+        }
+
+        /// <summary>
+        /// Emulates calling wix.exe with standard backends.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <param name="coreProvider"></param>
+        /// <param name="messages"></param>
+        /// <param name="warningsAsErrors"></param>
+        /// <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;
+
+            var messaging = coreProvider.GetService<IMessaging>();
+            messaging.SetListener(listener);
+
+            if (warningsAsErrors)
+            {
+                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);
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.Heat/PayloadTests.cs b/src/test/WixToolsetTest.Heat/PayloadTests.cs
new file mode 100644
index 00000000..8072f50d
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/PayloadTests.cs
@@ -0,0 +1,66 @@
+// 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
+{
+    using System;
+    using System.IO;
+    using WixBuildTools.TestSupport;
+    using Xunit;
+
+    public class PayloadTests
+    {
+        [Fact]
+        public void CanHarvestExePackagePayload()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var outputFilePath = Path.Combine(baseFolder, "test.wxs");
+
+                var result = HeatRunner.Execute(new[]
+                {
+                    "exepackagepayload",
+                    Path.Combine(folder, ".Data", "burn.exe"),
+                    "-o", outputFilePath,
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(outputFilePath));
+
+                var expected = File.ReadAllText(Path.Combine(folder, "Payload", "HarvestedExePackagePayload.wxs")).Replace("\r\n", "\n");
+                var actual = File.ReadAllText(outputFilePath).Replace("\r\n", "\n");
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void CanHarvestMsuPackagePayload()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var outputFilePath = Path.Combine(baseFolder, "test.wxs");
+
+                var result = HeatRunner.Execute(new[]
+                {
+                    "msupackagepayload",
+                    Path.Combine(folder, ".Data", "Windows8.1-KB2937592-x86.msu"),
+                    "-o", outputFilePath,
+                });
+
+                result.AssertSuccess();
+
+                Assert.True(File.Exists(outputFilePath));
+
+                var expected = File.ReadAllText(Path.Combine(folder, "Payload", "HarvestedMsuPackagePayload.wxs")).Replace("\r\n", "\n");
+                var actual = File.ReadAllText(outputFilePath).Replace("\r\n", "\n");
+                Assert.Equal(expected, actual);
+            }
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu b/src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu
new file mode 100644
index 00000000..c39f53b0
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu
diff --git a/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe b/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe
new file mode 100644
index 00000000..2a4f423f
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe
diff --git a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs b/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs
new file mode 100644
index 00000000..40100f22
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <ExePackagePayload Description="WiX Toolset Bootstrapper" Hash="F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964E246A1E8AE72E2CF23E0138AFC281BAFDE45969204405E114EB20C8195DA7E5E" ProductName="Windows Installer XML Toolset" Size="463360" Version="3.14.1703.0" />
+    </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs b/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs
new file mode 100644
index 00000000..f203fe27
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <MsuPackagePayload Hash="904ADEA6AB675ACE16483138BF3F5850FD56ACB6E3A13AFA7263ED49C68CCE6CF84D6AAD6F99AAF175A95EE1A56C787C5AD968019056490B1073E7DBB7B9B7BE" Size="309544" />
+    </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
new file mode 100644
index 00000000..4af6749c
--- /dev/null
+++ b/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
@@ -0,0 +1,28 @@
+<?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 Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\heat\heat.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+  </ItemGroup>
+</Project>