diff options
| author | Bob Arnson <bob@firegiant.com> | 2025-04-24 21:32:49 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2025-06-18 16:15:49 -0400 |
| commit | 50fe3d149a101b2569647689673fa01d67ff5267 (patch) | |
| tree | 418fc10800ee23318d3ce7820aee1465b49c1db0 /src/tools/test/WixToolsetTest.Heat | |
| parent | 390ee54c29d050ba393ff431115308bdb2aaf4ca (diff) | |
| download | wix-50fe3d149a101b2569647689673fa01d67ff5267.tar.gz wix-50fe3d149a101b2569647689673fa01d67ff5267.tar.bz2 wix-50fe3d149a101b2569647689673fa01d67ff5267.zip | |
Remove deprecated Heat.
Fixes https://github.com/wixtoolset/issues/issues/9039
Diffstat (limited to 'src/tools/test/WixToolsetTest.Heat')
11 files changed, 0 insertions, 615 deletions
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 @@ | |||
| 1 | // 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. | ||
| 2 | |||
| 3 | namespace WixToolsetTest.Heat | ||
| 4 | { | ||
| 5 | using System; | ||
| 6 | using System.IO; | ||
| 7 | using System.Linq; | ||
| 8 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 9 | using WixInternal.MSTestSupport; | ||
| 10 | |||
| 11 | [TestClass] | ||
| 12 | public class DirectoryToPayloadGroupFixture | ||
| 13 | { | ||
| 14 | [TestMethod] | ||
| 15 | public void CanHarvestSimpleDirectory() | ||
| 16 | { | ||
| 17 | var folder = TestData.Get("TestData", "SingleFile"); | ||
| 18 | |||
| 19 | using (var fs = new DisposableFileSystem()) | ||
| 20 | { | ||
| 21 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 22 | |||
| 23 | var args = new[] | ||
| 24 | { | ||
| 25 | "dir", folder, | ||
| 26 | "-generate", "payloadgroup", | ||
| 27 | "-o", outputPath | ||
| 28 | }; | ||
| 29 | |||
| 30 | var result = HeatRunner.Execute(args); | ||
| 31 | result.AssertSuccess(); | ||
| 32 | |||
| 33 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 34 | WixAssert.CompareLineByLine(new[] | ||
| 35 | { | ||
| 36 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 37 | " <Fragment>", | ||
| 38 | " <PayloadGroup Id='TARGETDIR'>", | ||
| 39 | " <Payload SourceFile='SourceDir\\a.txt' />", | ||
| 40 | " </PayloadGroup>", | ||
| 41 | " </Fragment>", | ||
| 42 | "</Wix>", | ||
| 43 | }, wxs); | ||
| 44 | } | ||
| 45 | } | ||
| 46 | |||
| 47 | [TestMethod] | ||
| 48 | public void CanHarvestSimpleDirectoryWithSourceDirSubstitution() | ||
| 49 | { | ||
| 50 | var folder = TestData.Get("TestData", "SingleFile"); | ||
| 51 | |||
| 52 | using (var fs = new DisposableFileSystem()) | ||
| 53 | { | ||
| 54 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 55 | |||
| 56 | var args = new[] | ||
| 57 | { | ||
| 58 | "dir", folder, | ||
| 59 | "-generate", "payloadgroup", | ||
| 60 | "-var", "var.RootDir", | ||
| 61 | "-o", outputPath | ||
| 62 | }; | ||
| 63 | |||
| 64 | var result = HeatRunner.Execute(args); | ||
| 65 | result.AssertSuccess(); | ||
| 66 | |||
| 67 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 68 | WixAssert.CompareLineByLine(new[] | ||
| 69 | { | ||
| 70 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 71 | " <Fragment>", | ||
| 72 | " <PayloadGroup Id='TARGETDIR'>", | ||
| 73 | " <Payload SourceFile='$(var.RootDir)\\a.txt' />", | ||
| 74 | " </PayloadGroup>", | ||
| 75 | " </Fragment>", | ||
| 76 | "</Wix>", | ||
| 77 | }, wxs); | ||
| 78 | } | ||
| 79 | } | ||
| 80 | |||
| 81 | [TestMethod] | ||
| 82 | public void CanHarvestNestedFiles() | ||
| 83 | { | ||
| 84 | var folder = TestData.Get("TestData", "NestedFiles"); | ||
| 85 | |||
| 86 | using (var fs = new DisposableFileSystem()) | ||
| 87 | { | ||
| 88 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 89 | |||
| 90 | var args = new[] | ||
| 91 | { | ||
| 92 | "dir", folder, | ||
| 93 | "-generate", "payloadgroup", | ||
| 94 | "-o", outputPath | ||
| 95 | }; | ||
| 96 | |||
| 97 | var result = HeatRunner.Execute(args); | ||
| 98 | result.AssertSuccess(); | ||
| 99 | |||
| 100 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 101 | WixAssert.CompareLineByLine(new[] | ||
| 102 | { | ||
| 103 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 104 | " <Fragment>", | ||
| 105 | " <PayloadGroup Id='TARGETDIR'>", | ||
| 106 | " <Payload SourceFile='SourceDir\\Nested\\c.txt' Name='Nested\\c.txt' />", | ||
| 107 | " <Payload SourceFile='SourceDir\\b.txt' />", | ||
| 108 | " </PayloadGroup>", | ||
| 109 | " </Fragment>", | ||
| 110 | "</Wix>", | ||
| 111 | }, wxs); | ||
| 112 | } | ||
| 113 | } | ||
| 114 | } | ||
| 115 | } | ||
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 @@ | |||
| 1 | // 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. | ||
| 2 | |||
| 3 | namespace WixToolsetTest.Heat | ||
| 4 | { | ||
| 5 | using System.IO; | ||
| 6 | using System.Linq; | ||
| 7 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 8 | using WixInternal.MSTestSupport; | ||
| 9 | |||
| 10 | [TestClass] | ||
| 11 | public class HeatFixture | ||
| 12 | { | ||
| 13 | [TestMethod] | ||
| 14 | public void CanHarvestSimpleDirectory() | ||
| 15 | { | ||
| 16 | var folder = TestData.Get("TestData", "SingleFile"); | ||
| 17 | |||
| 18 | using (var fs = new DisposableFileSystem()) | ||
| 19 | { | ||
| 20 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 21 | |||
| 22 | var args = new[] | ||
| 23 | { | ||
| 24 | "dir", folder, | ||
| 25 | "-o", outputPath | ||
| 26 | }; | ||
| 27 | |||
| 28 | var result = HeatRunner.Execute(args); | ||
| 29 | result.AssertSuccess(); | ||
| 30 | |||
| 31 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 32 | WixAssert.CompareLineByLine(new[] | ||
| 33 | { | ||
| 34 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 35 | " <Fragment>", | ||
| 36 | " <StandardDirectory Id='TARGETDIR'>", | ||
| 37 | " <Directory Id='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8' Name='SingleFile' />", | ||
| 38 | " </StandardDirectory>", | ||
| 39 | " </Fragment>", | ||
| 40 | " <Fragment>", | ||
| 41 | " <DirectoryRef Id='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8'>", | ||
| 42 | " <Component Id='cmp0i3dThrp4nheCteEmXvHxBDa_VE' Guid='PUT-GUID-HERE'>", | ||
| 43 | " <File Id='filziMcXYgrmcbVF8PuTUfIB9Vgqo0' KeyPath='yes' Source='SourceDir\\a.txt' />", | ||
| 44 | " </Component>", | ||
| 45 | " </DirectoryRef>", | ||
| 46 | " </Fragment>", | ||
| 47 | "</Wix>", | ||
| 48 | }, wxs); | ||
| 49 | } | ||
| 50 | } | ||
| 51 | |||
| 52 | [TestMethod] | ||
| 53 | public void CanHarvestSimpleDirectoryToComponentGroup() | ||
| 54 | { | ||
| 55 | var folder = TestData.Get("TestData", "SingleFile"); | ||
| 56 | |||
| 57 | using (var fs = new DisposableFileSystem()) | ||
| 58 | { | ||
| 59 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 60 | |||
| 61 | var args = new[] | ||
| 62 | { | ||
| 63 | "dir", folder, | ||
| 64 | "-cg", "CG1", | ||
| 65 | "-o", outputPath | ||
| 66 | }; | ||
| 67 | |||
| 68 | var result = HeatRunner.Execute(args); | ||
| 69 | result.AssertSuccess(); | ||
| 70 | |||
| 71 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 72 | WixAssert.CompareLineByLine(new[] | ||
| 73 | { | ||
| 74 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 75 | " <Fragment>", | ||
| 76 | " <StandardDirectory Id='TARGETDIR'>", | ||
| 77 | " <Directory Id='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8' Name='SingleFile' />", | ||
| 78 | " </StandardDirectory>", | ||
| 79 | " </Fragment>", | ||
| 80 | " <Fragment>", | ||
| 81 | " <ComponentGroup Id='CG1'>", | ||
| 82 | " <Component Id='cmp0i3dThrp4nheCteEmXvHxBDa_VE' Directory='dirwsJn0Cqs9KdlDSFdQsu9ygYvMF8' Guid='PUT-GUID-HERE'>", | ||
| 83 | " <File Id='filziMcXYgrmcbVF8PuTUfIB9Vgqo0' KeyPath='yes' Source='SourceDir\\a.txt' />", | ||
| 84 | " </Component>", | ||
| 85 | " </ComponentGroup>", | ||
| 86 | " </Fragment>", | ||
| 87 | "</Wix>", | ||
| 88 | }, wxs); | ||
| 89 | } | ||
| 90 | } | ||
| 91 | |||
| 92 | [TestMethod] | ||
| 93 | public void CanHarvestSimpleDirectoryToInstallFolder() | ||
| 94 | { | ||
| 95 | var folder = TestData.Get("TestData", "SingleFile"); | ||
| 96 | |||
| 97 | using (var fs = new DisposableFileSystem()) | ||
| 98 | { | ||
| 99 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 100 | |||
| 101 | var args = new[] | ||
| 102 | { | ||
| 103 | "dir", folder, | ||
| 104 | "-dr", "INSTALLFOLDER", | ||
| 105 | "-indent", "2", | ||
| 106 | "-o", outputPath | ||
| 107 | }; | ||
| 108 | |||
| 109 | var result = HeatRunner.Execute(args); | ||
| 110 | result.AssertSuccess(); | ||
| 111 | |||
| 112 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 113 | WixAssert.CompareLineByLine(new[] | ||
| 114 | { | ||
| 115 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 116 | " <Fragment>", | ||
| 117 | " <DirectoryRef Id='INSTALLFOLDER'>", | ||
| 118 | " <Directory Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE' Name='SingleFile' />", | ||
| 119 | " </DirectoryRef>", | ||
| 120 | " </Fragment>", | ||
| 121 | " <Fragment>", | ||
| 122 | " <DirectoryRef Id='dirlooNEIrtEBL2w_RhFEIgiKcUlxE'>", | ||
| 123 | " <Component Id='cmpxHVF6oXohc0EWgRphmYZvw5.GGU' Guid='PUT-GUID-HERE'>", | ||
| 124 | " <File Id='filk_7KUAfL4VfzxSRsGFf_XOBHln0' KeyPath='yes' Source='SourceDir\\a.txt' />", | ||
| 125 | " </Component>", | ||
| 126 | " </DirectoryRef>", | ||
| 127 | " </Fragment>", | ||
| 128 | "</Wix>", | ||
| 129 | }, wxs); | ||
| 130 | } | ||
| 131 | } | ||
| 132 | |||
| 133 | [TestMethod] | ||
| 134 | public void CanHarvestFile() | ||
| 135 | { | ||
| 136 | var folder = TestData.Get("TestData", "SingleFile"); | ||
| 137 | |||
| 138 | using (var fs = new DisposableFileSystem()) | ||
| 139 | { | ||
| 140 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 141 | |||
| 142 | var args = new[] | ||
| 143 | { | ||
| 144 | "file", Path.Combine(folder, "a.txt"), | ||
| 145 | "-cg", "GroupA", | ||
| 146 | "-dr", "ProgramFiles6432Folder", | ||
| 147 | "-o", outputPath | ||
| 148 | |||
| 149 | }; | ||
| 150 | |||
| 151 | var result = HeatRunner.Execute(args); | ||
| 152 | result.AssertSuccess(); | ||
| 153 | |||
| 154 | var wxs = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 155 | WixAssert.CompareLineByLine(new[] | ||
| 156 | { | ||
| 157 | "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>", | ||
| 158 | " <Fragment>", | ||
| 159 | " <StandardDirectory Id='ProgramFiles6432Folder'>", | ||
| 160 | " <Directory Id='dirl6r_Yc0gvMUEUVe5rioOOIIasoU' Name='SingleFile' />", | ||
| 161 | " </StandardDirectory>", | ||
| 162 | " </Fragment>", | ||
| 163 | " <Fragment>", | ||
| 164 | " <ComponentGroup Id='GroupA'>", | ||
| 165 | " <Component Id='cmpfBcW61_XzosRWK3EzUTBtJrcJD8' Directory='dirl6r_Yc0gvMUEUVe5rioOOIIasoU' Guid='PUT-GUID-HERE'>", | ||
| 166 | " <File Id='filKrZgaIOSKpNZXFnezZc9X.LKGpw' KeyPath='yes' Source='SourceDir\\SingleFile\\a.txt' />", | ||
| 167 | " </Component>", | ||
| 168 | " </ComponentGroup>", | ||
| 169 | " </Fragment>", | ||
| 170 | "</Wix>", | ||
| 171 | }, wxs); | ||
| 172 | } | ||
| 173 | } | ||
| 174 | |||
| 175 | [TestMethod] | ||
| 176 | public void CanHarvestRegistry() | ||
| 177 | { | ||
| 178 | var folder = TestData.Get("TestData", "RegFile"); | ||
| 179 | |||
| 180 | using (var fs = new DisposableFileSystem()) | ||
| 181 | { | ||
| 182 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 183 | |||
| 184 | var args = new[] | ||
| 185 | { | ||
| 186 | "reg", Path.Combine(folder, "input.reg"), | ||
| 187 | "-o", outputPath | ||
| 188 | }; | ||
| 189 | |||
| 190 | var result = HeatRunner.Execute(args); | ||
| 191 | result.AssertSuccess(); | ||
| 192 | |||
| 193 | var actual = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 194 | var expected = File.ReadAllLines(Path.Combine(folder, "Expected.wxs")).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 195 | WixAssert.CompareLineByLine(expected, actual); | ||
| 196 | } | ||
| 197 | } | ||
| 198 | |||
| 199 | [TestMethod] | ||
| 200 | public void CanHarvestRegistryIntoComponentGroup() | ||
| 201 | { | ||
| 202 | var folder = TestData.Get("TestData", "RegFile"); | ||
| 203 | |||
| 204 | using (var fs = new DisposableFileSystem()) | ||
| 205 | { | ||
| 206 | var outputPath = Path.Combine(fs.GetFolder(), "out.wxs"); | ||
| 207 | |||
| 208 | var args = new[] | ||
| 209 | { | ||
| 210 | "reg", Path.Combine(folder, "input.reg"), | ||
| 211 | "-cg", "CG1", | ||
| 212 | "-o", outputPath | ||
| 213 | }; | ||
| 214 | |||
| 215 | var result = HeatRunner.Execute(args); | ||
| 216 | result.AssertSuccess(); | ||
| 217 | |||
| 218 | var actual = File.ReadAllLines(outputPath).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 219 | var expected = File.ReadAllLines(Path.Combine(folder, "ExpectedWithComponentGroup.wxs")).Select(s => s.Replace("\"", "'")).ToArray(); | ||
| 220 | WixAssert.CompareLineByLine(expected, actual); | ||
| 221 | } | ||
| 222 | } | ||
| 223 | } | ||
| 224 | } | ||
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 @@ | |||
| 1 | // 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. | ||
| 2 | |||
| 3 | namespace WixToolsetTest.Heat | ||
| 4 | { | ||
| 5 | using System.Collections.Generic; | ||
| 6 | using System.Threading.Tasks; | ||
| 7 | using WixToolset.Core; | ||
| 8 | using WixInternal.Core.MSTestPackage; | ||
| 9 | using WixToolset.Data; | ||
| 10 | using WixToolset.Extensibility.Services; | ||
| 11 | using WixToolset.Tools.Heat; | ||
| 12 | |||
| 13 | /// <summary> | ||
| 14 | /// Utility class to emulate heat.exe. | ||
| 15 | /// </summary> | ||
| 16 | public static class HeatRunner | ||
| 17 | { | ||
| 18 | /// <summary> | ||
| 19 | /// Emulates calling heat.exe. | ||
| 20 | /// </summary> | ||
| 21 | /// <param name="args"></param> | ||
| 22 | /// <param name="messages"></param> | ||
| 23 | /// <param name="warningsAsErrors"></param> | ||
| 24 | /// <returns></returns> | ||
| 25 | public static int Execute(string[] args, out List<Message> messages, bool warningsAsErrors = true) | ||
| 26 | { | ||
| 27 | var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); | ||
| 28 | var task = Execute(args, serviceProvider, out messages, warningsAsErrors: warningsAsErrors); | ||
| 29 | return task.Result; | ||
| 30 | } | ||
| 31 | |||
| 32 | /// <summary> | ||
| 33 | /// Emulates calling wix.exe with standard backends. | ||
| 34 | /// This overload always treats warnings as errors. | ||
| 35 | /// </summary> | ||
| 36 | /// <param name="args"></param> | ||
| 37 | /// <returns></returns> | ||
| 38 | public static WixRunnerResult Execute(params string[] args) | ||
| 39 | { | ||
| 40 | return Execute(warningsAsErrors: false, args); | ||
| 41 | } | ||
| 42 | |||
| 43 | /// <summary> | ||
| 44 | /// Emulates calling wix.exe with standard backends. | ||
| 45 | /// </summary> | ||
| 46 | /// <param name="warningsAsErrors"></param> | ||
| 47 | /// <param name="args"></param> | ||
| 48 | /// <returns></returns> | ||
| 49 | public static WixRunnerResult Execute(bool warningsAsErrors, params string[] args) | ||
| 50 | { | ||
| 51 | var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); | ||
| 52 | var exitCode = Execute(args, serviceProvider, out var messages, warningsAsErrors: warningsAsErrors); | ||
| 53 | return new WixRunnerResult { ExitCode = exitCode.Result, Messages = messages.ToArray() }; | ||
| 54 | } | ||
| 55 | |||
| 56 | /// <summary> | ||
| 57 | /// Emulates calling wix.exe with standard backends. | ||
| 58 | /// </summary> | ||
| 59 | /// <param name="args"></param> | ||
| 60 | /// <param name="coreProvider"></param> | ||
| 61 | /// <param name="messages"></param> | ||
| 62 | /// <param name="warningsAsErrors"></param> | ||
| 63 | /// <returns></returns> | ||
| 64 | public static Task<int> Execute(string[] args, IWixToolsetCoreServiceProvider coreProvider, out List<Message> messages, bool warningsAsErrors = true) | ||
| 65 | { | ||
| 66 | var listener = new TestMessageListener(); | ||
| 67 | |||
| 68 | messages = listener.Messages; | ||
| 69 | |||
| 70 | var messaging = coreProvider.GetService<IMessaging>(); | ||
| 71 | messaging.SetListener(listener); | ||
| 72 | |||
| 73 | if (warningsAsErrors) | ||
| 74 | { | ||
| 75 | messaging.WarningsAsError = true; | ||
| 76 | } | ||
| 77 | |||
| 78 | var program = new Program(); | ||
| 79 | return program.Run(coreProvider, listener, args); | ||
| 80 | } | ||
| 81 | } | ||
| 82 | } | ||
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 @@ | |||
| 1 | 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 @@ | |||
| 1 | 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 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 2 | <Fragment> | ||
| 3 | <StandardDirectory Id="TARGETDIR"> | ||
| 4 | <Component Id="cmpojwP28s4WmDsBqWw98dt3GqX0Qc" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 5 | <RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web" Root="HKLM" /> | ||
| 6 | </Component> | ||
| 7 | <Component Id="cmplcKhDXbrKnnKie3DODK0NdtNNOg" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 8 | <RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters" Root="HKLM" /> | ||
| 9 | </Component> | ||
| 10 | <Component Id="cmpQwsceagjGFkCYf0mDbar_x8di7o" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 11 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Java" Root="HKLM"> | ||
| 12 | <RegistryValue Name="Options" Type="multiString"> | ||
| 13 | <MultiStringValue Value="-Ddaemon.clojure.ns=panther.was.web.daemon" /> | ||
| 14 | </RegistryValue> | ||
| 15 | <RegistryValue Name="Options9" Type="multiString"> | ||
| 16 | <MultiStringValue Value="--add-modules=java.corba" /> | ||
| 17 | </RegistryValue> | ||
| 18 | <RegistryValue Name="Classpath" Value="%WAS_DEPS_CLASSPATH%\*;%ServiceBasePath%\Sensors\service.jvm.web-standalone.jar" Type="string" /> | ||
| 19 | <RegistryValue Name="JvmMx" Value="4096" Type="integer" /> | ||
| 20 | </RegistryKey> | ||
| 21 | </Component> | ||
| 22 | <Component Id="cmpmdi0PQPGI0rXbHgRjCLk1kVRjDY" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 23 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Log" Root="HKLM"> | ||
| 24 | <RegistryValue Name="Prefix" Value="service.jvm.web" Type="string" /> | ||
| 25 | </RegistryKey> | ||
| 26 | </Component> | ||
| 27 | <Component Id="cmpZMMSl80BpzgFJnOoQHZhE6TKx5c" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 28 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Start" Root="HKLM"> | ||
| 29 | <RegistryValue Name="Class" Value="service.was.webDaemon" Type="string" /> | ||
| 30 | <RegistryValue Name="Params" Type="multiString"> | ||
| 31 | <MultiStringValue Value="--store-path" /> | ||
| 32 | <MultiStringValue Value=""%ProgramData%\softek\panther\panther.was.web\store.jks"" /> | ||
| 33 | </RegistryValue> | ||
| 34 | <RegistryValue Name="Method" Value="startWindows" Type="string" /> | ||
| 35 | <RegistryValue Name="Mode" Value="jvm" Type="string" /> | ||
| 36 | </RegistryKey> | ||
| 37 | </Component> | ||
| 38 | <Component Id="cmphc0PosUreNHPfVVRiTRupYb3SzQ" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 39 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Stop" Root="HKLM"> | ||
| 40 | <RegistryValue Name="Class" Value="service.was.webDaemon" Type="string" /> | ||
| 41 | <RegistryValue Name="Method" Value="stopWindows" Type="string" /> | ||
| 42 | <RegistryValue Name="Mode" Value="jvm" Type="string" /> | ||
| 43 | <RegistryValue Name="Timeout" Value="2500" Type="integer" /> | ||
| 44 | </RegistryKey> | ||
| 45 | </Component> | ||
| 46 | <Component Id="cmpvXIwMqQZoA011CevdgYD.oX.O1Y" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 47 | <RegistryKey ForceCreateOnInstall="yes" Key="SYSTEM\CurrentControlSet\Services\service.jvm.web\Parameters" Root="HKLM" /> | ||
| 48 | </Component> | ||
| 49 | </StandardDirectory> | ||
| 50 | </Fragment> | ||
| 51 | </Wix> | ||
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 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 2 | <Fragment> | ||
| 3 | <StandardDirectory Id='TARGETDIR' /> | ||
| 4 | </Fragment> | ||
| 5 | <Fragment> | ||
| 6 | <ComponentGroup Id="CG1"> | ||
| 7 | <Component Id="cmpojwP28s4WmDsBqWw98dt3GqX0Qc" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 8 | <RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web" Root="HKLM" /> | ||
| 9 | </Component> | ||
| 10 | <Component Id="cmplcKhDXbrKnnKie3DODK0NdtNNOg" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 11 | <RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters" Root="HKLM" /> | ||
| 12 | </Component> | ||
| 13 | <Component Id="cmpQwsceagjGFkCYf0mDbar_x8di7o" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 14 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Java" Root="HKLM"> | ||
| 15 | <RegistryValue Name="Options" Type="multiString"> | ||
| 16 | <MultiStringValue Value="-Ddaemon.clojure.ns=panther.was.web.daemon" /> | ||
| 17 | </RegistryValue> | ||
| 18 | <RegistryValue Name="Options9" Type="multiString"> | ||
| 19 | <MultiStringValue Value="--add-modules=java.corba" /> | ||
| 20 | </RegistryValue> | ||
| 21 | <RegistryValue Name="Classpath" Value="%WAS_DEPS_CLASSPATH%\*;%ServiceBasePath%\Sensors\service.jvm.web-standalone.jar" Type="string" /> | ||
| 22 | <RegistryValue Name="JvmMx" Value="4096" Type="integer" /> | ||
| 23 | </RegistryKey> | ||
| 24 | </Component> | ||
| 25 | <Component Id="cmpmdi0PQPGI0rXbHgRjCLk1kVRjDY" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 26 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Log" Root="HKLM"> | ||
| 27 | <RegistryValue Name="Prefix" Value="service.jvm.web" Type="string" /> | ||
| 28 | </RegistryKey> | ||
| 29 | </Component> | ||
| 30 | <Component Id="cmpZMMSl80BpzgFJnOoQHZhE6TKx5c" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 31 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Start" Root="HKLM"> | ||
| 32 | <RegistryValue Name="Class" Value="service.was.webDaemon" Type="string" /> | ||
| 33 | <RegistryValue Name="Params" Type="multiString"> | ||
| 34 | <MultiStringValue Value="--store-path" /> | ||
| 35 | <MultiStringValue Value=""%ProgramData%\softek\panther\panther.was.web\store.jks"" /> | ||
| 36 | </RegistryValue> | ||
| 37 | <RegistryValue Name="Method" Value="startWindows" Type="string" /> | ||
| 38 | <RegistryValue Name="Mode" Value="jvm" Type="string" /> | ||
| 39 | </RegistryKey> | ||
| 40 | </Component> | ||
| 41 | <Component Id="cmphc0PosUreNHPfVVRiTRupYb3SzQ" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 42 | <RegistryKey Key="SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Stop" Root="HKLM"> | ||
| 43 | <RegistryValue Name="Class" Value="service.was.webDaemon" Type="string" /> | ||
| 44 | <RegistryValue Name="Method" Value="stopWindows" Type="string" /> | ||
| 45 | <RegistryValue Name="Mode" Value="jvm" Type="string" /> | ||
| 46 | <RegistryValue Name="Timeout" Value="2500" Type="integer" /> | ||
| 47 | </RegistryKey> | ||
| 48 | </Component> | ||
| 49 | <Component Id="cmpvXIwMqQZoA011CevdgYD.oX.O1Y" Directory="TARGETDIR" Guid="PUT-GUID-HERE" KeyPath="yes"> | ||
| 50 | <RegistryKey ForceCreateOnInstall="yes" Key="SYSTEM\CurrentControlSet\Services\service.jvm.web\Parameters" Root="HKLM" /> | ||
| 51 | </Component> | ||
| 52 | </ComponentGroup> | ||
| 53 | </Fragment> | ||
| 54 | </Wix> | ||
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 @@ | |||
| 1 | Windows Registry Editor Version 5.00 | ||
| 2 | |||
| 3 | [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web] | ||
| 4 | |||
| 5 | [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters] | ||
| 6 | |||
| 7 | [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Java] | ||
| 8 | "Options"=hex(7):2d,00,44,00,64,00,61,00,65,00,6d,00,6f,00,6e,00,2e,00,63,00,\ | ||
| 9 | 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,\ | ||
| 10 | 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,\ | ||
| 11 | 2e,00,64,00,61,00,65,00,6d,00,6f,00,6e,00,00,00,00,00 | ||
| 12 | "Options9"=hex(7):2d,00,2d,00,61,00,64,00,64,00,2d,00,6d,00,6f,00,64,00,75,00,\ | ||
| 13 | 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,\ | ||
| 14 | 00,61,00,00,00,00,00 | ||
| 15 | "Classpath"="%WAS_DEPS_CLASSPATH%\*;%ServiceBasePath%\Sensors\service.jvm.web-standalone.jar" | ||
| 16 | "JvmMx"=dword:00001000 | ||
| 17 | |||
| 18 | [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Log] | ||
| 19 | "Prefix"="service.jvm.web" | ||
| 20 | |||
| 21 | [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Start] | ||
| 22 | "Class"="service.was.webDaemon" | ||
| 23 | "Params"=hex(7):2d,00,2d,00,73,00,74,00,6f,00,72,00,65,00,2d,00,70,00,61,00,74,\ | ||
| 24 | 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,\ | ||
| 25 | 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,\ | ||
| 26 | 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,\ | ||
| 27 | 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,\ | ||
| 28 | 00,6f,00,72,00,65,00,2e,00,6a,00,6b,00,73,00,22,00,00,00,00,00 | ||
| 29 | "Method"="startWindows" | ||
| 30 | "Mode"="jvm" | ||
| 31 | |||
| 32 | [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Apache Software Foundation\Procrun 2.0\service.jvm.web\Parameters\Stop] | ||
| 33 | "Class"="service.was.webDaemon" | ||
| 34 | "Method"="stopWindows" | ||
| 35 | "Mode"="jvm" | ||
| 36 | "Timeout"=dword:000009c4 | ||
| 37 | |||
| 38 | |||
| 39 | |||
| 40 | [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\service.jvm.web\Parameters] | ||
| 41 | |||
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <xsl:stylesheet | ||
| 3 | version="1.0" | ||
| 4 | xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | ||
| 5 | xmlns="http://www.w3.org/1999/xhtml" | ||
| 6 | xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 7 | |||
| 8 | <xsl:output method="xml" indent="yes"/> | ||
| 9 | |||
| 10 | <xsl:template match="@*|node()"> | ||
| 11 | <xsl:copy> | ||
| 12 | <xsl:apply-templates select="@*|node()"/> | ||
| 13 | </xsl:copy> | ||
| 14 | </xsl:template> | ||
| 15 | |||
| 16 | <xsl:template match="wix:Wix/wix:Fragment/wix:StandardDirectory/wix:Component/wix:RegistryKey/wix:RegistryValue[@Name='Classpath']"> | ||
| 17 | <xsl:copy> | ||
| 18 | <xsl:apply-templates select="@*|node()"/> | ||
| 19 | <xsl:attribute name="Value"><xsl:text>%WAS_DEPS_CLASSPATH%\*;[DIR_JVM]service.jvm.web-standalone.jar</xsl:text></xsl:attribute> | ||
| 20 | </xsl:copy> | ||
| 21 | </xsl:template> | ||
| 22 | |||
| 23 | </xsl:stylesheet> | ||
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 @@ | |||
| 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 deleted file mode 100644 index 660dca3b..00000000 --- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <!-- 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. --> | ||
| 3 | |||
| 4 | <Project Sdk="MSTest.Sdk"> | ||
| 5 | <PropertyGroup> | ||
| 6 | <TargetFramework>net472</TargetFramework> | ||
| 7 | <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> | ||
| 8 | <IsWixMSTestProject>true</IsWixMSTestProject> | ||
| 9 | </PropertyGroup> | ||
| 10 | |||
| 11 | <ItemGroup> | ||
| 12 | <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" /> | ||
| 13 | </ItemGroup> | ||
| 14 | |||
| 15 | <ItemGroup> | ||
| 16 | <ProjectReference Include="..\..\heat\heat.csproj" /> | ||
| 17 | </ItemGroup> | ||
| 18 | |||
| 19 | <ItemGroup> | ||
| 20 | <PackageReference Include="WixInternal.Core.MSTestPackage" /> | ||
| 21 | </ItemGroup> | ||
| 22 | </Project> | ||
