From 3abf00a71151d1caef6e853a2f330d7691f4abf8 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 24 Apr 2025 21:32:49 -0400 Subject: Remove deprecated Heat. Fixes https://github.com/wixtoolset/issues/issues/9039 --- .../DirectoryToPayloadGroupFixture.cs | 115 ----------- src/tools/test/WixToolsetTest.Heat/HeatFixture.cs | 224 --------------------- src/tools/test/WixToolsetTest.Heat/HeatRunner.cs | 82 -------- .../TestData/NestedFiles/Nested/c.txt | 1 - .../WixToolsetTest.Heat/TestData/NestedFiles/b.txt | 1 - .../TestData/RegFile/Expected.wxs | 51 ----- .../RegFile/ExpectedWithComponentGroup.wxs | 54 ----- .../WixToolsetTest.Heat/TestData/RegFile/input.reg | 41 ---- .../TestData/RegFile/input.xslt | 23 --- .../WixToolsetTest.Heat/TestData/SingleFile/a.txt | 1 - .../WixToolsetTest.Heat/WixToolsetTest.Heat.csproj | 22 -- 11 files changed, 615 deletions(-) delete mode 100644 src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs delete mode 100644 src/tools/test/WixToolsetTest.Heat/HeatFixture.cs delete mode 100644 src/tools/test/WixToolsetTest.Heat/HeatRunner.cs delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/Nested/c.txt delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/b.txt delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/RegFile/Expected.wxs delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/RegFile/ExpectedWithComponentGroup.wxs delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.reg delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.xslt delete mode 100644 src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt delete mode 100644 src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj (limited to 'src/tools/test/WixToolsetTest.Heat') diff --git a/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs b/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs deleted file mode 100644 index db71c4cd..00000000 --- a/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs +++ /dev/null @@ -1,115 +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.Heat -{ - using System; - using System.IO; - using System.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; - using WixInternal.MSTestSupport; - - [TestClass] - public class DirectoryToPayloadGroupFixture - { - [TestMethod] - 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, - "-generate", "payloadgroup", - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(new[] - { - "", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - - [TestMethod] - public void CanHarvestSimpleDirectoryWithSourceDirSubstitution() - { - var folder = TestData.Get("TestData", "SingleFile"); - - using (var fs = new DisposableFileSystem()) - { - var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); - - var args = new[] - { - "dir", folder, - "-generate", "payloadgroup", - "-var", "var.RootDir", - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(new[] - { - "", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - - [TestMethod] - public void CanHarvestNestedFiles() - { - var folder = TestData.Get("TestData", "NestedFiles"); - - using (var fs = new DisposableFileSystem()) - { - var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); - - var args = new[] - { - "dir", folder, - "-generate", "payloadgroup", - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(new[] - { - "", - " ", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - } -} diff --git a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs deleted file mode 100644 index c5f3df74..00000000 --- a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs +++ /dev/null @@ -1,224 +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.Heat -{ - using System.IO; - using System.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; - using WixInternal.MSTestSupport; - - [TestClass] - public class HeatFixture - { - [TestMethod] - 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[] - { - "", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - - [TestMethod] - public void CanHarvestSimpleDirectoryToComponentGroup() - { - var folder = TestData.Get("TestData", "SingleFile"); - - using (var fs = new DisposableFileSystem()) - { - var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); - - var args = new[] - { - "dir", folder, - "-cg", "CG1", - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(new[] - { - "", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - - [TestMethod] - 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", - "-indent", "2", - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(new[] - { - "", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - - [TestMethod] - 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[] - { - "", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "", - }, wxs); - } - } - - [TestMethod] - public void CanHarvestRegistry() - { - var folder = TestData.Get("TestData", "RegFile"); - - using (var fs = new DisposableFileSystem()) - { - var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); - - var args = new[] - { - "reg", Path.Combine(folder, "input.reg"), - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var actual = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - var expected = File.ReadAllLines(Path.Combine(folder, "Expected.wxs")).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(expected, actual); - } - } - - [TestMethod] - public void CanHarvestRegistryIntoComponentGroup() - { - var folder = TestData.Get("TestData", "RegFile"); - - using (var fs = new DisposableFileSystem()) - { - var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); - - var args = new[] - { - "reg", Path.Combine(folder, "input.reg"), - "-cg", "CG1", - "-o", outputPath - }; - - var result = HeatRunner.Execute(args); - result.AssertSuccess(); - - var actual = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); - var expected = File.ReadAllLines(Path.Combine(folder, "ExpectedWithComponentGroup.wxs")).Select(s => s.Replace("\"", "'")).ToArray(); - WixAssert.CompareLineByLine(expected, actual); - } - } - } -} diff --git a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs deleted file mode 100644 index d8dec06f..00000000 --- a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs +++ /dev/null @@ -1,82 +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.Heat -{ - using System.Collections.Generic; - using System.Threading.Tasks; - using WixToolset.Core; - using WixInternal.Core.MSTestPackage; - using WixToolset.Data; - using WixToolset.Extensibility.Services; - using WixToolset.Tools.Heat; - - /// - /// Utility class to emulate heat.exe. - /// - public static class HeatRunner - { - /// - /// Emulates calling heat.exe. - /// - /// - /// - /// - /// - public static int Execute(string[] args, out List messages, bool warningsAsErrors = true) - { - var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); - var task = Execute(args, serviceProvider, out messages, warningsAsErrors: warningsAsErrors); - return task.Result; - } - - /// - /// Emulates calling wix.exe with standard backends. - /// This overload always treats warnings as errors. - /// - /// - /// - public static WixRunnerResult Execute(params string[] args) - { - return Execute(warningsAsErrors: false, args); - } - - /// - /// Emulates calling wix.exe with standard backends. - /// - /// - /// - /// - 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() }; - } - - /// - /// Emulates calling wix.exe with standard backends. - /// - /// - /// - /// - /// - /// - public static Task Execute(string[] args, IWixToolsetCoreServiceProvider coreProvider, out List messages, bool warningsAsErrors = true) - { - var listener = new TestMessageListener(); - - messages = listener.Messages; - - var messaging = coreProvider.GetService(); - messaging.SetListener(listener); - - if (warningsAsErrors) - { - messaging.WarningsAsError = true; - } - - var program = new Program(); - return program.Run(coreProvider, listener, args); - } - } -} diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/Nested/c.txt b/src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/Nested/c.txt deleted file mode 100644 index 17c43215..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/Nested/c.txt +++ /dev/null @@ -1 +0,0 @@ -This be c.txt. \ No newline at end of file diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/b.txt b/src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/b.txt deleted file mode 100644 index 704b3d88..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/NestedFiles/b.txt +++ /dev/null @@ -1 +0,0 @@ -This is b.txt diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/Expected.wxs b/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/Expected.wxs deleted file mode 100644 index 2bc48bca..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/Expected.wxs +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/ExpectedWithComponentGroup.wxs b/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/ExpectedWithComponentGroup.wxs deleted file mode 100644 index bb94a265..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/ExpectedWithComponentGroup.wxs +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.reg b/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.reg deleted file mode 100644 index 85ebe01e..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.reg +++ /dev/null @@ -1,41 +0,0 @@ -Windows Registry Editor Version 5.00 - -[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web] - -[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters] - -[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Java] -"Options"=hex(7):2d,00,44,00,64,00,61,00,65,00,6d,00,6f,00,6e,00,2e,00,63,00,\ - 6c,00,6f,00,6a,00,75,00,72,00,65,00,2e,00,6e,00,73,00,3d,00,70,00,61,00,6e,\ - 00,74,00,68,00,65,00,72,00,2e,00,77,00,61,00,73,00,2e,00,77,00,65,00,62,00,\ - 2e,00,64,00,61,00,65,00,6d,00,6f,00,6e,00,00,00,00,00 -"Options9"=hex(7):2d,00,2d,00,61,00,64,00,64,00,2d,00,6d,00,6f,00,64,00,75,00,\ - 6c,00,65,00,73,00,3d,00,6a,00,61,00,76,00,61,00,2e,00,63,00,6f,00,72,00,62,\ - 00,61,00,00,00,00,00 -"Classpath"="%WAS_DEPS_CLASSPATH%\*;%ServiceBasePath%\Sensors\service.jvm.web-standalone.jar" -"JvmMx"=dword:00001000 - -[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Log] -"Prefix"="service.jvm.web" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Start] -"Class"="service.was.webDaemon" -"Params"=hex(7):2d,00,2d,00,73,00,74,00,6f,00,72,00,65,00,2d,00,70,00,61,00,74,\ - 00,68,00,00,00,22,00,25,00,50,00,72,00,6f,00,67,00,72,00,61,00,6d,00,44,00,\ - 61,00,74,00,61,00,25,00,5c,00,73,00,6f,00,66,00,74,00,65,00,6b,00,5c,00,70,\ - 00,61,00,6e,00,74,00,68,00,65,00,72,00,5c,00,70,00,61,00,6e,00,74,00,68,00,\ - 65,00,72,00,2e,00,77,00,61,00,73,00,2e,00,77,00,65,00,62,00,5c,00,73,00,74,\ - 00,6f,00,72,00,65,00,2e,00,6a,00,6b,00,73,00,22,00,00,00,00,00 -"Method"="startWindows" -"Mode"="jvm" - -[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Stop] -"Class"="service.was.webDaemon" -"Method"="stopWindows" -"Mode"="jvm" -"Timeout"=dword:000009c4 - - - -[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\service.jvm.web\Parameters] - diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.xslt b/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.xslt deleted file mode 100644 index 7a46243a..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/RegFile/input.xslt +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - %WAS_DEPS_CLASSPATH%\*;[DIR_JVM]service.jvm.web-standalone.jar - - - - diff --git a/src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt b/src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt deleted file mode 100644 index 4410bb5e..00000000 --- a/src/tools/test/WixToolsetTest.Heat/TestData/SingleFile/a.txt +++ /dev/null @@ -1 +0,0 @@ -This is a.txt diff --git a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj deleted file mode 100644 index 660dca3b..00000000 --- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - net472 - TestData\**;$(DefaultItemExcludes) - true - - - - - - - - - - - - - - -- cgit v1.2.3-55-g6feb