From 50fe3d149a101b2569647689673fa01d67ff5267 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 --- src/tools/test/Directory.Build.props | 10 - .../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 -- .../WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs | 411 --------------------- .../EnsureWixSdkCached/EnsureWixSdkCached.wixproj | 4 - .../HeatFileMultipleFilesSameFileName.wixproj | 26 -- .../MyProgram.json | 1 - .../MyProgram.txt | 1 - .../HeatFileMultipleFilesSameFileName/Package.wxs | 18 - .../HeatFilePackage/HeatFilePackage.wixproj | 21 -- .../TestData/HeatFilePackage/Package.wxs | 17 - .../HeatProjectPreSdkStyle.wixproj | 18 - .../HeatProject/HeatProjectPreSdkStyle/Package.wxs | 17 - .../HeatProjectSdkStyle.wixproj | 18 - .../HeatProject/HeatProjectSdkStyle/Package.wxs | 17 - .../TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs | 8 - .../HeatProject/SdkStyleCs/SdkStyleCs.csproj | 8 - .../Tools Version 4Cs/Properties/AssemblyInfo.cs | 11 - .../Tools Version 4Cs/Tools Version 4Cs.csproj | 36 -- .../WixToolsetTest.HeatTasks.csproj | 20 - .../WixToolsetTest.HeatTasks.v3.ncrunchproject | 5 - 30 files changed, 1282 deletions(-) delete mode 100644 src/tools/test/Directory.Build.props 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 delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/Package.wxs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/Package.wxs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Properties/AssemblyInfo.cs delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Tools Version 4Cs.csproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj delete mode 100644 src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject (limited to 'src/tools/test') diff --git a/src/tools/test/Directory.Build.props b/src/tools/test/Directory.Build.props deleted file mode 100644 index a0c9a659..00000000 --- a/src/tools/test/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - $(OutputPath)test\$(ProjectName) - - 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 - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs b/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs deleted file mode 100644 index 61efad47..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/MsbuildHeatFixture.cs +++ /dev/null @@ -1,411 +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.Sdk -{ - using System; - using System.IO; - using System.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; - using WixInternal.MSTestSupport; - using WixInternal.Core.MSTestPackage; - using WixToolset.Data; - using WixToolset.Data.Symbols; - - [TestClass] - public class MsbuildHeatFixture - { - public static readonly string HeatTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).LocalPath), "..", "..", "..", "publish", "WixToolset.Heat", "build", "WixToolset.Heat.targets"); - - public MsbuildHeatFixture() - { - EnsureWixSdkCached(); - } - - [TestMethod] - [DataRow(BuildSystem.DotNetCoreSdk)] - [DataRow(BuildSystem.MSBuild)] - [DataRow(BuildSystem.MSBuild64)] - public void CanBuildHeatFilePackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get("TestData", "HeatFilePackage"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, @"bin"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(sourceFolder, "HeatFilePackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { - "-Restore", - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath), - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "BaseIntermediateOutputPath", intermediateFolder), - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "OutputPath", binFolder), - }); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem); - WixAssert.Single(heatCommandLines); - - var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray(); - WixAssert.All(warnings, warning => warning.Contains("warning HEAT5149")); - - var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs"); - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - WixAssert.StringEqual(@"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "HeatFilePackage.wixpdb"); - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - WixAssert.StringEqual(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - } - } - - [TestMethod] - [DataRow(BuildSystem.DotNetCoreSdk)] - [DataRow(BuildSystem.MSBuild)] - [DataRow(BuildSystem.MSBuild64)] - public void CanBuildHeatFileWithMultipleFilesPackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData", "HeatFileMultipleFilesSameFileName"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(sourceFolder, "HeatFileMultipleFilesSameFileName.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] { - "-Restore", - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath), - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "BaseIntermediateOutputPath", intermediateFolder), - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "OutputPath", binFolder), - }); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem); - Assert.AreEqual(2, heatCommandLines.Count()); - - var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray(); - WixAssert.All(warnings, warning => warning.Contains("warning HEAT5149")); - - var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs"); - Assert.IsTrue(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - WixAssert.StringEqual("" + - "" + - "" + - "" + - @"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - generatedFilePath = Path.Combine(intermediateFolder, "Release", "_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs"); - Assert.IsTrue(File.Exists(generatedFilePath)); - - generatedContents = File.ReadAllText(generatedFilePath); - testXml = generatedContents.GetTestXml(); - WixAssert.StringEqual("" + - "" + - "" + - "" + - @"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "HeatFileMultipleFilesSameFileName.wixpdb"); - Assert.IsTrue(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbols = section.Symbols.OfType().ToArray(); - WixAssert.StringEqual(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - WixAssert.StringEqual(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - } - } - - [TestMethod] - [DataRow(BuildSystem.DotNetCoreSdk, true)] - [DataRow(BuildSystem.DotNetCoreSdk, false)] - [DataRow(BuildSystem.MSBuild, true)] - [DataRow(BuildSystem.MSBuild, false)] - [DataRow(BuildSystem.MSBuild64, true)] - [DataRow(BuildSystem.MSBuild64, false)] - public void CanBuildHeatProjectPreSdkStyle(BuildSystem buildSystem, bool useToolsVersion) - { - var sourceFolder = TestData.Get(@"TestData", "HeatProject"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - File.Copy("global.json", Path.Combine(fs.BaseFolder, "global.json")); - - var baseFolder = Path.Combine(fs.BaseFolder, "HeatProjectPreSdkStyle"); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(baseFolder, "HeatProjectPreSdkStyle.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath), - useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty, - }); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem); - var heatCommandLine = WixAssert.Single(heatCommandLines); - - if (useToolsVersion && buildSystem != BuildSystem.DotNetCoreSdk) - { - Assert.IsTrue(heatCommandLine.Contains("-usetoolsversion")); - } - else - { - Assert.IsFalse(heatCommandLine.Contains("-usetoolsversion")); - } - - var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray(); - WixAssert.All(warnings, warning => warning.Contains("warning HEAT5149")); - - var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_Tools Version 4Cs.wxs"); - Assert.IsTrue(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - WixAssert.StringEqual(@"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "Release", "HeatProjectPreSdkStyle.wixpdb"); - Assert.IsTrue(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "Tools Version 4Cs", "bin", "Release\\\\Tools Version 4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); - } - } - - [TestMethod] - [DataRow(BuildSystem.DotNetCoreSdk, true)] - [DataRow(BuildSystem.DotNetCoreSdk, false)] - [DataRow(BuildSystem.MSBuild, true)] - [DataRow(BuildSystem.MSBuild, false)] - [DataRow(BuildSystem.MSBuild64, true)] - [DataRow(BuildSystem.MSBuild64, false)] - public void CanBuildHeatProjectSdkStyle(BuildSystem buildSystem, bool useToolsVersion) - { - var sourceFolder = TestData.Get(@"TestData\HeatProject"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - File.Copy("global.json", Path.Combine(fs.BaseFolder, "global.json")); - - var baseFolder = Path.Combine(fs.BaseFolder, "HeatProjectSdkStyle"); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(fs.BaseFolder, "HeatProjectSdkStyle", "HeatProjectSdkStyle.wixproj"); - var referencedProjectPath = Path.Combine(fs.BaseFolder, "SdkStyleCs", "SdkStyleCs.csproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, referencedProjectPath, new[] - { - "-t:restore", - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath), - }); - result.AssertSuccess(); - - result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "HeatTargetsPath", MsbuildHeatFixture.HeatTargetsPath), - useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty, - }); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem); - var heatCommandLine = WixAssert.Single(heatCommandLines); - - if (useToolsVersion && buildSystem != BuildSystem.DotNetCoreSdk) - { - Assert.IsTrue(heatCommandLine.Contains("-usetoolsversion")); - } - else - { - Assert.IsFalse(heatCommandLine.Contains("-usetoolsversion")); - } - - var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray(); - WixAssert.All(warnings, warning => warning.Contains("warning HEAT5149")); - - var generatedFilePath = Path.Combine(intermediateFolder, "Release", "_SdkStyleCs.wxs"); - Assert.IsTrue(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - WixAssert.StringEqual(@"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "Release", "HeatProjectSdkStyle.wixpdb"); - Assert.IsTrue(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); - } - } - - /// - /// This method exists to get the WixToolset.Sdk.nupkg into the NuGet package cache using the global.json - /// and nuget.config in the root of the repository. By pre-caching the WiX SDK, the rest of the tests will - /// pull the binaries out of the cache instead of needing to find the original .nupkg in the build artifacts - /// folder (which requires use of nuget.config found in the root of the repo) - /// - private static void EnsureWixSdkCached() - { - // This EnsureWixSdkCached project exists only to pre-cache the WixToolset.Sdk for use by later projects. - var sourceFolder = TestData.Get("TestData", "EnsureWixSdkCached"); - - var result = MsbuildUtilities.BuildProject(BuildSystem.DotNetCoreSdk, Path.Combine(sourceFolder, "EnsureWixSdkCached.wixproj"), new[] - { - "-t:restore", - }); - result.AssertSuccess(); - } - } -} diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj deleted file mode 100644 index 7730425f..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/EnsureWixSdkCached/EnsureWixSdkCached.wixproj +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj deleted file mode 100644 index 2aaf5c01..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - true - - - - - TxtProductComponents - INSTALLFOLDER - true - - - JsonProductComponents - INSTALLFOLDER - true - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json deleted file mode 100644 index 5f282702..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt deleted file mode 100644 index 5f282702..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/Package.wxs deleted file mode 100644 index 5abcee9f..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFileMultipleFilesSameFileName/Package.wxs +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj deleted file mode 100644 index 345832cf..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - true - - - - - ProductComponents - INSTALLFOLDER - true - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/Package.wxs deleted file mode 100644 index f5fa8cf6..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatFilePackage/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj deleted file mode 100644 index 14def612..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - true - true - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs deleted file mode 100644 index 568f9cdd..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj deleted file mode 100644 index c0048434..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - true - true - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs deleted file mode 100644 index d30218f3..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs deleted file mode 100644 index 2b2c5be2..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs +++ /dev/null @@ -1,8 +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 SdkStyleCs -{ - public class SdkStyleCs - { - } -} diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj deleted file mode 100644 index 755976bc..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - netstandard2.0 - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Properties/AssemblyInfo.cs b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Properties/AssemblyInfo.cs deleted file mode 100644 index fed7cd9e..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +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. - -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Tools Version 4Cs")] -[assembly: AssemblyDescription("Tools Version 4Cs")] -[assembly: AssemblyProduct("WiX Toolset")] -[assembly: AssemblyCompany("WiX Toolset Team")] -[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Tools Version 4Cs.csproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Tools Version 4Cs.csproj deleted file mode 100644 index def5ccb2..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/Tools Version 4Cs/Tools Version 4Cs.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - {8B19578A-816A-48A1-A6C4-58067334EB79} - Tools Version 4Cs - Library - ToolsVersion4Cs - v4.7.2 - - - true - false - $(DefineConstants);DEBUG;TRACE - bin\Debug\ - - - true - true - $(DefineConstants);TRACE - bin\Release\ - - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj deleted file mode 100644 index 13ec5ac3..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - net472 - TestData\**;$(DefaultItemExcludes) - true - - - - - - - - - - - - diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject deleted file mode 100644 index 319cd523..00000000 --- a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file -- cgit v1.2.3-55-g6feb