From 22c97adba70fa838b8f285d404750d0f8fe685d8 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 20 Mar 2020 19:55:02 +1000 Subject: Update Example.Extension to automatically update based on its Example.wxs. Use .wixlib instead of .wir, and skip tests which are now failing. Add more bundle tests. --- .../CompileCoreTestExtensionWixlib.csproj | 13 +++++++++ src/test/CompileCoreTestExtensionWixlib/Program.cs | 33 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj create mode 100644 src/test/CompileCoreTestExtensionWixlib/Program.cs (limited to 'src/test/CompileCoreTestExtensionWixlib') diff --git a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj new file mode 100644 index 00000000..4bc1d02b --- /dev/null +++ b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj @@ -0,0 +1,13 @@ + + + + + + net461 + Exe + + + + + + \ No newline at end of file diff --git a/src/test/CompileCoreTestExtensionWixlib/Program.cs b/src/test/CompileCoreTestExtensionWixlib/Program.cs new file mode 100644 index 00000000..308ab8a2 --- /dev/null +++ b/src/test/CompileCoreTestExtensionWixlib/Program.cs @@ -0,0 +1,33 @@ +// 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.Collections.Generic; +using WixToolset.Core.TestPackage; + +namespace CompileCoreTestExtensionWixlib +{ + // We want to be able to test Core with extensions, but there's no easy way to build an extension without Tools. + // So we have this helper exe. + public class Program + { + public static void Main(string[] args) + { + var intermediateFolder = args[0]; + var wixlibPath = args[1]; + + var buildArgs = new List(); + buildArgs.Add("build"); + foreach (var path in args[2].Split(';')) + { + buildArgs.Add(path); + } + buildArgs.Add("-intermediateFolder"); + buildArgs.Add(intermediateFolder); + buildArgs.Add("-o"); + buildArgs.Add(wixlibPath); + + var result = WixRunner.Execute(buildArgs.ToArray()); + + result.AssertSuccess(); + } + } +} -- cgit v1.2.3-55-g6feb