From 7bdd5e9159b298e0411afa689a06c44e36e293cd Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 3 May 2021 16:05:08 -0700 Subject: Move NetFx.wixext into ext --- .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 147 --------------------- .../UsingDotNetCorePackages/BundleLatest.wxs | 12 -- .../UsingDotNetCorePackages/BundleLatest_x64.wxs | 12 -- .../TestData/UsingNativeImage/Package.en-us.wxl | 9 -- .../TestData/UsingNativeImage/Package.wxs | 15 --- .../UsingNativeImage/PackageComponents.wxs | 11 -- .../TestData/UsingNativeImage/example.txt | 1 - .../WixToolsetTest.Netfx.csproj | 40 ------ .../WixToolsetTest.Netfx.v3.ncrunchproject | 5 - 9 files changed, 252 deletions(-) delete mode 100644 src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt delete mode 100644 src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj delete mode 100644 src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject (limited to 'src/test') diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs deleted file mode 100644 index 72d4a682..00000000 --- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ /dev/null @@ -1,147 +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.Netfx -{ - using System.IO; - using System.Linq; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - using WixToolset.Netfx; - using Xunit; - - public class NetfxExtensionFixture - { - [Fact] - public void CanBuildUsingLatestDotNetCorePackages() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - } - } - - [Fact] - public void CanBuildUsingLatestDotNetCorePackages_X64() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - } - } - - [Fact] - public void CanBuildUsingNativeImage() - { - var folder = TestData.Get(@"TestData\UsingNativeImage"); - var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); - Assert.Equal(new[] - { - "Binary:Wix4NetFxCA_X86\t[Binary data]", - "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageUninstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", - "CustomAction:Wix4NetFxScheduleNativeImage_X86\t1\tWix4NetFxCA_X86\tSchedNetFx\t", - "Wix4NetFxNativeImage:ExampleNgen\tfil6349_KNDJhqShNzVdHX3ihhvA6Y\t3\t8\t\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildUsingNativeImageX64() - { - var folder = TestData.Get(@"TestData\UsingNativeImage"); - var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); - Assert.Equal(new[] - { - "Binary:Wix4NetFxCA_X64\t[Binary data]", - "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageUninstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", - "CustomAction:Wix4NetFxScheduleNativeImage_X64\t1\tWix4NetFxCA_X64\tSchedNetFx\t", - "Wix4NetFxNativeImage:ExampleNgen\tfil6349_KNDJhqShNzVdHX3ihhvA6Y\t3\t8\t\t", - }, results.OrderBy(s => s).ToArray()); - } - - [Fact] - public void CanBuildUsingNativeImageARM64() - { - var folder = TestData.Get(@"TestData\UsingNativeImage"); - var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); - Assert.Equal(new[] - { - "Binary:Wix4NetFxCA_A64\t[Binary data]", - "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", - "CustomAction:Wix4NetFxExecuteNativeImageUninstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", - "CustomAction:Wix4NetFxScheduleNativeImage_A64\t1\tWix4NetFxCA_A64\tSchedNetFx\t", - "Wix4NetFxNativeImage:ExampleNgen\tfil6349_KNDJhqShNzVdHX3ihhvA6Y\t3\t8\t\t", - }, results.OrderBy(s => s).ToArray()); - } - - private static void Build(string[] args) - { - var result = WixRunner.Execute(args); - result.AssertSuccess(); - } - - private static void BuildX64(string[] args) - { - var newArgs = args.ToList(); - newArgs.Add("-platform"); - newArgs.Add("x64"); - - var result = WixRunner.Execute(newArgs.ToArray()); - result.AssertSuccess(); - } - - private static void BuildARM64(string[] args) - { - var newArgs = args.ToList(); - newArgs.Add("-platform"); - newArgs.Add("arm64"); - - var result = WixRunner.Execute(newArgs.ToArray()); - result.AssertSuccess(); - } - } -} diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs deleted file mode 100644 index 8e3d2c30..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs deleted file mode 100644 index fc42ac99..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl deleted file mode 100644 index 5301bb1a..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - A newer version of [ProductName] is already installed. - MsiPackage - - diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs deleted file mode 100644 index ace73680..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs deleted file mode 100644 index a1c806d9..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/PackageComponents.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt b/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingNativeImage/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj deleted file mode 100644 index 1c41d176..00000000 --- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - netcoreapp3.1 - embedded - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject deleted file mode 100644 index 7b5b2139..00000000 --- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file -- cgit v1.2.3-55-g6feb