From 03d5c46cbbb94f73ac468709345fc6a0e50def8d Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 22 Apr 2021 17:57:31 -0700 Subject: Move Tools into wix --- .../WixBuildTaskFixture.cs | 67 ---- .../WixToolsetTest.BuildTasks.csproj | 35 -- .../WixToolsetTest.BuildTasks.v3.ncrunchproject | 8 - src/test/WixToolsetTest.Heat/HeatRunner.cs | 92 ----- src/test/WixToolsetTest.Heat/PayloadTests.cs | 66 --- .../TestData/.Data/Windows8.1-KB2937592-x86.msu | Bin 309544 -> 0 bytes .../WixToolsetTest.Heat/TestData/.Data/burn.exe | Bin 463360 -> 0 bytes .../Payload/HarvestedExePackagePayload.wxs | 6 - .../Payload/HarvestedMsuPackagePayload.wxs | 6 - .../WixToolsetTest.Heat/WixToolsetTest.Heat.csproj | 28 -- src/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 442 --------------------- src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs | 375 ----------------- src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs | 98 ----- src/test/WixToolsetTest.Sdk/README.md | 5 - .../HeatFileMultipleFilesSameFileName.wixproj | 58 --- .../MyProgram.json | 1 - .../MyProgram.txt | 1 - .../HeatFileMultipleFilesSameFileName/Package.wxs | 18 - .../HeatFilePackage/HeatFilePackage.wixproj | 53 --- .../TestData/HeatFilePackage/Package.wxs | 17 - .../HeatProjectPreSdkStyle.wixproj | 50 --- .../HeatProject/HeatProjectPreSdkStyle/Package.wxs | 17 - .../HeatProjectSdkStyle.wixproj | 50 --- .../HeatProject/HeatProjectSdkStyle/Package.wxs | 17 - .../TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs | 8 - .../HeatProject/SdkStyleCs/SdkStyleCs.csproj | 8 - .../ToolsVersion4Cs/Properties/AssemblyInfo.cs | 11 - .../ToolsVersion4Cs/ToolsVersion4Cs.csproj | 36 -- .../MergeMsiPackage/MergeMsiPackage.wixproj | 44 -- .../MergeModule/MergeMsiPackage/Package.wxs | 17 - .../MergeModule/SimpleMergeModule/MergeModule.wxs | 19 - .../SimpleMergeModule/SimpleMergeModule.wixproj | 42 -- .../SimpleMergeModule/data/MergeModule.txt | 1 - .../MsiPackage/MsiPackage.wixproj | 50 --- .../MsiPackage/Package.de-de.wxl | 11 - .../MsiPackage/Package.en-us.wxl | 11 - .../MultiCulturalMsiPackage/MsiPackage/Package.wxs | 16 - .../MsiPackage/PackageComponents.wxs | 10 - .../MsiPackage/data/test.txt | 1 - .../MultiCulturalMsiPackage.sln | 31 -- .../SimpleMsiPackage/MsiPackage/MsiPackage.wixproj | 46 --- .../SimpleMsiPackage/MsiPackage/Package.en-us.wxl | 11 - .../SimpleMsiPackage/MsiPackage/Package.wxs | 19 - .../MsiPackage/PackageComponents.wxs | 10 - .../SimpleMsiPackage/MsiPackage/data/test.txt | 1 - .../SimpleMsiPackage/SimpleBundle/Bundle.wxs | 11 - .../SimpleBundle/SimpleBundle.wixproj | 42 -- .../TestData/SimpleMsiPackage/SimpleMsiPackage.sln | 39 -- .../SimpleMsiPackage/UncompressedBundle/Bundle.wxs | 11 - .../UncompressedBundle/UncompressedBundle.wixproj | 42 -- .../WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj | 59 --- .../WixToolsetTest.Sdk.v3.ncrunchproject | 8 - 52 files changed, 2125 deletions(-) delete mode 100644 src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs delete mode 100644 src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj delete mode 100644 src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject delete mode 100644 src/test/WixToolsetTest.Heat/HeatRunner.cs delete mode 100644 src/test/WixToolsetTest.Heat/PayloadTests.cs delete mode 100644 src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu delete mode 100644 src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe delete mode 100644 src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs delete mode 100644 src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs delete mode 100644 src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj delete mode 100644 src/test/WixToolsetTest.Sdk/MsbuildFixture.cs delete mode 100644 src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs delete mode 100644 src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs delete mode 100644 src/test/WixToolsetTest.Sdk/README.md delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj delete mode 100644 src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj delete mode 100644 src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject (limited to 'src/test') diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs deleted file mode 100644 index 9d132f66..00000000 --- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs +++ /dev/null @@ -1,67 +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.BuildTasks -{ - using System.IO; - using System.Linq; - using Microsoft.Build.Utilities; - using WixBuildTools.TestSupport; - using WixToolset.BuildTasks; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using Xunit; - - public class WixBuildTaskFixture - { - [Fact] - public void CanBuildSimpleMsiPackage() - { - var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var pdbPath = Path.Combine(baseFolder, @"bin\testpackage.wixpdb"); - var engine = new FakeBuildEngine(); - - var task = new WixBuild - { - BuildEngine = engine, - SourceFiles = new[] - { - new TaskItem(Path.Combine(folder, "Package.wxs")), - new TaskItem(Path.Combine(folder, "PackageComponents.wxs")), - }, - LocalizationFiles = new[] - { - new TaskItem(Path.Combine(folder, "Package.en-us.wxl")), - }, - BindInputPaths = new[] - { - new TaskItem(Path.Combine(folder, "data")), - }, - IntermediateDirectory = new TaskItem(intermediateFolder), - OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")), - PdbType = "Full", - PdbFile = new TaskItem(pdbPath), - DefaultCompressionLevel = "nOnE", - }; - - var result = task.Execute(); - Assert.True(result, $"MSBuild task failed unexpectedly. Output:\r\n{engine.Output}"); - - Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi"))); - Assert.True(File.Exists(pdbPath)); - Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\cab1.cab"))); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); - } - } - } -} diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj deleted file mode 100644 index c01860cd..00000000 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - net461 - false - embedded - win-x86 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject deleted file mode 100644 index f1d03cd7..00000000 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Heat/HeatRunner.cs b/src/test/WixToolsetTest.Heat/HeatRunner.cs deleted file mode 100644 index 287698a9..00000000 --- a/src/test/WixToolsetTest.Heat/HeatRunner.cs +++ /dev/null @@ -1,92 +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.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; - - /// - /// 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(true, 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) - { - coreProvider.AddBundleBackend(); - - var listener = new TestMessageListener(); - - messages = listener.Messages; - - var messaging = coreProvider.GetService(); - messaging.SetListener(listener); - - if (warningsAsErrors) - { - messaging.WarningsAsError = true; - } - - var arguments = coreProvider.GetService(); - 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 deleted file mode 100644 index 8072f50d..00000000 --- a/src/test/WixToolsetTest.Heat/PayloadTests.cs +++ /dev/null @@ -1,66 +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.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 deleted file mode 100644 index c39f53b0..00000000 Binary files a/src/test/WixToolsetTest.Heat/TestData/.Data/Windows8.1-KB2937592-x86.msu and /dev/null differ diff --git a/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe b/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe deleted file mode 100644 index 2a4f423f..00000000 Binary files a/src/test/WixToolsetTest.Heat/TestData/.Data/burn.exe and /dev/null differ diff --git a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs b/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs deleted file mode 100644 index 40100f22..00000000 --- a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedExePackagePayload.wxs +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ 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 deleted file mode 100644 index f203fe27..00000000 --- a/src/test/WixToolsetTest.Heat/TestData/Payload/HarvestedMsuPackagePayload.wxs +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj deleted file mode 100644 index 4af6749c..00000000 --- a/src/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - netcoreapp3.1 - false - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs deleted file mode 100644 index 3c8e79e7..00000000 --- a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ /dev/null @@ -1,442 +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.Collections.Generic; - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - using Xunit; - - public class MsbuildFixture - { - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleBundle(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = Path.Combine(fs.BaseFolder, "SimpleBundle"); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "SimpleBundle.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(new[] - { - @"bin\x86\Release\SimpleBundle.exe", - @"bin\x86\Release\SimpleBundle.wixpdb", - }, paths); - } - } - - [Theory(Skip = "Test demonstrates failure")] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildUncompressedBundle(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = Path.Combine(fs.BaseFolder, "UncompressedBundle"); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "UncompressedBundle.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(new[] - { - @"bin\x86\Release\SimpleBundle.exe", - @"bin\x86\Release\SimpleBundle.wixpdb", - @"bin\x86\Release\test.txt", - }, paths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleMergeModule(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\MergeModule\SimpleMergeModule"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "SimpleMergeModule.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(new[] - { - @"bin\x86\Release\SimpleMergeModule.msm", - @"bin\x86\Release\SimpleMergeModule.wixpdb", - }, paths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleMsiPackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var platformSwitches = result.Output.Where(line => line.Contains("-platform x86")); - Assert.Single(platformSwitches); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Equal(4, warnings.Count()); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(new[] - { - @"bin\x86\Release\en-US\cab1.cab", - @"bin\x86\Release\en-US\MsiPackage.msi", - @"bin\x86\Release\en-US\MsiPackage.wixpdb", - }, paths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleMsiPackageWithMergeModule(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\MergeModule"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = Path.Combine(fs.BaseFolder, "MergeMsiPackage"); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MergeMsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(new[] - { - @"bin\x86\Release\cab1.cab", - @"bin\x86\Release\MergeMsiPackage.msi", - @"bin\x86\Release\MergeMsiPackage.wixpdb", - }, paths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildWithDefaultAndExplicitlyFullWixpdbs(BuildSystem buildSystem) - { - var expectedOutputs = new[] - { - @"bin\x86\Release\en-US\cab1.cab", - @"bin\x86\Release\en-US\MsiPackage.msi", - @"bin\x86\Release\en-US\MsiPackage.wixpdb", - }; - - this.AssertWixpdb(buildSystem, null, expectedOutputs); - this.AssertWixpdb(buildSystem, "Full", expectedOutputs); - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildWithNoWixpdb(BuildSystem buildSystem) - { - this.AssertWixpdb(buildSystem, "NONE", new[] - { - @"bin\x86\Release\en-US\cab1.cab", - @"bin\x86\Release\en-US\MsiPackage.msi", - }); - } - - private void AssertWixpdb(BuildSystem buildSystem, string wixpdbType, string[] expectedOutputFiles) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}", - }); - result.AssertSuccess(); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(expectedOutputFiles, paths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuild64BitMsiPackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - $"-p:Platform=x64", - }); - result.AssertSuccess(); - - var platformSwitches = result.Output.Where(line => line.Contains("-platform x64")); - Assert.Single(platformSwitches); - - var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - WixAssert.CompareLineByLine(new[] - { - @"bin\x64\Release\en-US\cab1.cab", - @"bin\x64\Release\en-US\MsiPackage.msi", - @"bin\x64\Release\en-US\MsiPackage.wixpdb", - }, paths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleMsiPackageWithIceSuppressions(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressIces", "ICE45;ICE46"), - }); - result.AssertSuccess(); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildSimpleMsiPackageWithWarningSuppressions(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressSpecificWarnings", "1118;1102"), - }); - result.AssertSuccess(); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk, null)] - [InlineData(BuildSystem.DotNetCoreSdk, true)] - [InlineData(BuildSystem.MSBuild, null)] - [InlineData(BuildSystem.MSBuild, true)] - [InlineData(BuildSystem.MSBuild64, null)] - [InlineData(BuildSystem.MSBuild64, true)] - public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - "-p:OutputType=IntermediatePostLink", - }, outOfProc: outOfProc); - result.AssertSuccess(); - - var wixBuildCommands = MsbuildUtilities.GetToolCommandLines(result, "wix", "build", buildSystem, outOfProc); - Assert.Single(wixBuildCommands); - - var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .Single(); - Assert.Equal(@"bin\x86\Release\MsiPackage.wixipl", path); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildAndCleanSimpleMsiPackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - // Build - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, verbosityLevel: "diag"); - result.AssertSuccess(); - - var buildOutput = String.Join("\r\n", result.Output); - - var createdPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .OrderBy(s => s) - .ToArray(); - Assert.NotEmpty(createdPaths); - - // Clean - result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - "-t:Clean", - }, verbosityLevel: "diag"); - result.AssertSuccess(); - - var cleanOutput = String.Join("\r\n", result.Output); - - // Clean is only expected to delete the files listed in {Project}.FileListAbsolute.txt, - // so this is not quite right but close enough. - var allowedFiles = new HashSet - { - "MsiPackage.wixproj", - "Package.en-us.wxl", - "Package.wxs", - "PackageComponents.wxs", - @"data\test.txt", - @"obj\x86\Release\MsiPackage.wixproj.FileListAbsolute.txt", - }; - - var remainingPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories) - .Select(s => s.Substring(baseFolder.Length + 1)) - .Where(s => !allowedFiles.Contains(s)) - .OrderBy(s => s) - .ToArray(); - Assert.Empty(remainingPaths); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void ReportsInnerExceptionForUnexpectedExceptions(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixToolDir", Path.Combine(MsbuildUtilities.WixMsbuildPath, "broken", "net461")), - }, outOfProc: true); - Assert.Equal(1, result.ExitCode); - - var expectedMessage = "System.PlatformNotSupportedException: Could not find platform specific 'wixnative.exe' ---> System.IO.FileNotFoundException: Could not find internal piece of WiX Toolset from"; - Assert.Contains(result.Output, m => m.Contains(expectedMessage)); - } - } - } -} diff --git a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs deleted file mode 100644 index 8b2e8e3d..00000000 --- a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs +++ /dev/null @@ -1,375 +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.Collections.Generic; - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using Xunit; - - public class MsbuildHeatFixture - { - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildHeatFilePackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\HeatFilePackage"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(baseFolder, "HeatFilePackage.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true); - Assert.Single(heatCommandLines); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs"); - Assert.True(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - Assert.Equal(@"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatFilePackage.wixpdb"); - Assert.True(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] - public void CanBuildHeatFileWithMultipleFilesPackage(BuildSystem buildSystem) - { - var sourceFolder = TestData.Get(@"TestData\HeatFileMultipleFilesSameFileName"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(baseFolder, "HeatFileMultipleFilesSameFileName.wixproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, projectPath); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true); - Assert.Equal(2, heatCommandLines.Count()); - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs"); - Assert.True(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - Assert.Equal("" + - "" + - "" + - "" + - @"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs"); - Assert.True(File.Exists(generatedFilePath)); - - generatedContents = File.ReadAllText(generatedFilePath); - testXml = generatedContents.GetTestXml(); - Assert.Equal("" + - "" + - "" + - "" + - @"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatFileMultipleFilesSameFileName.wixpdb"); - Assert.True(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbols = section.Symbols.OfType().ToArray(); - Assert.Equal(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - Assert.Equal(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk, true)] - [InlineData(BuildSystem.DotNetCoreSdk, false)] - [InlineData(BuildSystem.MSBuild, true)] - [InlineData(BuildSystem.MSBuild, false)] - [InlineData(BuildSystem.MSBuild64, true)] - [InlineData(BuildSystem.MSBuild64, false)] - public void CanBuildHeatProjectPreSdkStyle(BuildSystem buildSystem, bool useToolsVersion) - { - var sourceFolder = TestData.Get(@"TestData\HeatProject"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - 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[] - { - useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty, - }); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem, true); - var heatCommandLine = Assert.Single(heatCommandLines); - - if (useToolsVersion && buildSystem != BuildSystem.DotNetCoreSdk) - { - Assert.Contains("-usetoolsversion", heatCommandLine); - } - else - { - Assert.DoesNotContain("-usetoolsversion", heatCommandLine); - } - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ToolsVersion4Cs.wxs"); - Assert.True(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - Assert.Equal(@"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatProjectPreSdkStyle.wixpdb"); - Assert.True(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); - } - } - - [Theory] - [InlineData(BuildSystem.DotNetCoreSdk, true)] - [InlineData(BuildSystem.DotNetCoreSdk, false)] - [InlineData(BuildSystem.MSBuild, true)] - [InlineData(BuildSystem.MSBuild, false)] - [InlineData(BuildSystem.MSBuild64, true)] - [InlineData(BuildSystem.MSBuild64, false)] - public void CanBuildHeatProjectSdkStyle(BuildSystem buildSystem, bool useToolsVersion) - { - var sourceFolder = TestData.Get(@"TestData\HeatProject"); - - using (var fs = new TestDataFolderFileSystem()) - { - fs.Initialize(sourceFolder); - var baseFolder = Path.Combine(fs.BaseFolder, "HeatProjectSdkStyle"); - var binFolder = Path.Combine(baseFolder, @"bin\"); - var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var projectPath = Path.Combine(baseFolder, "HeatProjectSdkStyle.wixproj"); - var referencedProjectPath = Path.Combine(fs.BaseFolder, "SdkStyleCs", "SdkStyleCs.csproj"); - - var result = MsbuildUtilities.BuildProject(buildSystem, referencedProjectPath, new[] - { - "-t:restore", - }); - result.AssertSuccess(); - - result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] - { - useToolsVersion ? $"-p:HarvestProjectsUseToolsVersion=true" : String.Empty, - }); - result.AssertSuccess(); - - var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "project", buildSystem, true); - var heatCommandLine = Assert.Single(heatCommandLines); - - if (useToolsVersion && buildSystem != BuildSystem.DotNetCoreSdk) - { - Assert.Contains("-usetoolsversion", heatCommandLine); - } - else - { - Assert.DoesNotContain("-usetoolsversion", heatCommandLine); - } - - var warnings = result.Output.Where(line => line.Contains(": warning")); - Assert.Empty(warnings); - - var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_SdkStyleCs.wxs"); - Assert.True(File.Exists(generatedFilePath)); - - var generatedContents = File.ReadAllText(generatedFilePath); - var testXml = generatedContents.GetTestXml(); - Assert.Equal(@"" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "", testXml); - - var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatProjectSdkStyle.wixpdb"); - Assert.True(File.Exists(pdbPath)); - - var intermediate = Intermediate.Load(pdbPath); - var section = intermediate.Sections.Single(); - - var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); - } - } - } -} diff --git a/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs deleted file mode 100644 index 2e07af3a..00000000 --- a/src/test/WixToolsetTest.Sdk/MsbuildUtilities.cs +++ /dev/null @@ -1,98 +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.Collections.Generic; - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - - public enum BuildSystem - { - DotNetCoreSdk, - MSBuild, - MSBuild64, - } - - public static class MsbuildUtilities - { - public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk"); - public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props"); - - public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal") - { - var allArgs = new List - { - $"-verbosity:{verbosityLevel}", - $"-p:Configuration={configuration}", - GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath), - // Node reuse means that child msbuild processes can stay around after the build completes. - // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang. - "-nr:false", - }; - - if (outOfProc.HasValue) - { - allArgs.Add($"-p:RunWixToolsOutOfProc={outOfProc.Value}"); - } - - if (arguments != null) - { - allArgs.AddRange(arguments); - } - - switch (buildSystem) - { - case BuildSystem.DotNetCoreSdk: - { - allArgs.Add(projectPath); - var result = DotnetRunner.Execute("msbuild", allArgs.ToArray()); - return new MsbuildRunnerResult - { - ExitCode = result.ExitCode, - Output = result.StandardOutput, - }; - } - case BuildSystem.MSBuild: - case BuildSystem.MSBuild64: - { - return MsbuildRunner.Execute(projectPath, allArgs.ToArray(), buildSystem == BuildSystem.MSBuild64); - } - default: - { - throw new NotImplementedException(); - } - } - } - - public static string GetQuotedPropertySwitch(BuildSystem buildSystem, string propertyName, string valueToQuote) - { - switch (buildSystem) - { - case BuildSystem.DotNetCoreSdk: - { - return $"-p:{propertyName}=\\\"{valueToQuote}\\\""; - } - case BuildSystem.MSBuild: - case BuildSystem.MSBuild64: - { - return $"-p:{propertyName}=\"{valueToQuote}\""; - } - default: - { - throw new NotImplementedException(); - } - } - } - - public static IEnumerable GetToolCommandLines(MsbuildRunnerResult result, string toolName, string operation, BuildSystem buildSystem, bool? outOfProc = null) - { - var expectedOutOfProc = buildSystem == BuildSystem.DotNetCoreSdk || outOfProc.HasValue && outOfProc.Value; - var expectedToolExe = !expectedOutOfProc ? $"({toolName}.exe)" : - buildSystem == BuildSystem.DotNetCoreSdk ? $"{toolName}.dll\"" : $"{toolName}.exe"; - var expectedToolCommand = $"{expectedToolExe} {operation}"; - return result.Output.Where(line => line.Contains(expectedToolCommand)); - } - } -} diff --git a/src/test/WixToolsetTest.Sdk/README.md b/src/test/WixToolsetTest.Sdk/README.md deleted file mode 100644 index 7faf34b9..00000000 --- a/src/test/WixToolsetTest.Sdk/README.md +++ /dev/null @@ -1,5 +0,0 @@ -In order to properly test wix.targets, -all of the supported architectures for WixToolset.BuildTasks need to be available in the layout used in the Nuget package. -Making this happen on every build for the solution takes too long, -so this project relies on manually running appveyor.cmd to publish everything before the tests can be run. -appveyor.cmd needs to be ran again every time changes are made in other projects, including the targets themselves. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj deleted file mode 100644 index 7d751319..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - - Debug - x86 - - - - 7fb77005-c6e0-454f-8c2d-0a4a79c918ba - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - true - - - - - TxtProductComponents - INSTALLFOLDER - true - - - JsonProductComponents - INSTALLFOLDER - true - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json deleted file mode 100644 index 5f282702..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt deleted file mode 100644 index 5f282702..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs deleted file mode 100644 index 5abcee9f..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj deleted file mode 100644 index 3988acaf..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/HeatFilePackage.wixproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Debug - x86 - - - - 7fb77005-c6e0-454f-8c2d-0a4a79c918ba - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - true - - - - - ProductComponents - INSTALLFOLDER - true - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs deleted file mode 100644 index f5fa8cf6..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj deleted file mode 100644 index c569e8ac..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Debug - x86 - - - - BB919765-DD69-41E7-91C5-415A69BE923E - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - true - true - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs deleted file mode 100644 index 6c12861b..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj deleted file mode 100644 index 907f0bb0..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Debug - x86 - - - - CE998A54-9BEC-4268-BFA2-8E3DAE5831C8 - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - true - true - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs deleted file mode 100644 index d30218f3..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.cs deleted file mode 100644 index 2b2c5be2..00000000 --- a/src/test/WixToolsetTest.Sdk/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/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj deleted file mode 100644 index 755976bc..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/SdkStyleCs/SdkStyleCs.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - netstandard2.0 - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/Properties/AssemblyInfo.cs deleted file mode 100644 index c29a2303..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/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("ToolsVersion4Cs")] -[assembly: AssemblyDescription("ToolsVersion4Cs")] -[assembly: AssemblyProduct("WiX Toolset")] -[assembly: AssemblyCompany("WiX Toolset Team")] -[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj deleted file mode 100644 index 9c55f7a5..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/ToolsVersion4Cs/ToolsVersion4Cs.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - {8B19578A-816A-48A1-A6C4-58067334EB79} - ToolsVersion4Cs - Library - ToolsVersion4Cs - v4.0 - - - true - false - $(DefineConstants);DEBUG;TRACE - bin\Debug\ - - - true - true - $(DefineConstants);TRACE - bin\Release\ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj deleted file mode 100644 index 77ee4420..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Debug - x86 - - - - {B00939D5-7952-4ADF-BEB1-507D227B2FE2} - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - SimpleMergeModule - {9F84998B-7F45-4CB3-8795-915801DBBB74} - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs deleted file mode 100644 index ef62c31b..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs deleted file mode 100644 index b892debd..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj deleted file mode 100644 index 91579790..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Debug - x86 - Module - - - - {9F84998B-7F45-4CB3-8795-915801DBBB74} - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt deleted file mode 100644 index cd0db0e1..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/data/MergeModule.txt +++ /dev/null @@ -1 +0,0 @@ -This is test.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj deleted file mode 100644 index 555addbe..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Debug - x86 - 0.9 - 7fb77005-c6e0-454f-8c2d-0a4a79c918ba - MsiPackage - Package - MsiPackage - MsiPackage - en-US,en;de-DE - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl deleted file mode 100644 index 23493ace..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - German DowngradeError - German FeatureTitle - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl deleted file mode 100644 index 38c12ac1..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs deleted file mode 100644 index df24aa33..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs deleted file mode 100644 index e26c4509..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt deleted file mode 100644 index cd0db0e1..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is test.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln deleted file mode 100644 index 2c88704e..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.8 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5} - EndGlobalSection -EndGlobal diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj deleted file mode 100644 index 18ae08b2..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - Debug - x86 - - - - 7fb77005-c6e0-454f-8c2d-0a4a79c918ba - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl deleted file mode 100644 index 38c12ac1..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs deleted file mode 100644 index 0a133c7d..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs deleted file mode 100644 index ddb95faf..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt deleted file mode 100644 index cd0db0e1..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/data/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is test.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs deleted file mode 100644 index 3b4a9d6a..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj deleted file mode 100644 index 199eb6d9..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Debug - x86 - - - - 6670d5c9-bbec-4828-ab60-4a1c0ffeb97d - Bundle - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln deleted file mode 100644 index dd21489d..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleMsiPackage.sln +++ /dev/null @@ -1,39 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30011.22 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SimpleBundle", "SimpleBundle\SimpleBundle.wixproj", "{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86 - {7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86 - {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x64.ActiveCfg = Debug|x86 - {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x86.ActiveCfg = Debug|x86 - {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x86.Build.0 = Debug|x86 - {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x64.ActiveCfg = Release|x86 - {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x86.ActiveCfg = Release|x86 - {6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5} - EndGlobalSection -EndGlobal diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs deleted file mode 100644 index 6ab9a016..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj deleted file mode 100644 index 199eb6d9..00000000 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Debug - x86 - - - - 6670d5c9-bbec-4828-ab60-4a1c0ffeb97d - Bundle - - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - Debug - - - $(Platform) - bin\$(Platform)\$(Configuration)\ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj deleted file mode 100644 index 35ed053a..00000000 --- a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - net461 - false - embedded - TestData\**;$(DefaultItemExcludes) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject b/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject deleted file mode 100644 index f1d03cd7..00000000 --- a/src/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.v3.ncrunchproject +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file -- cgit v1.2.3-55-g6feb