From 5b208b133e6970f4af247b7d13bd198637b4552b Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 14 Nov 2022 17:21:54 -0500 Subject: Fix Iis table definitions. Fixes https://github.com/wixtoolset/issues/issues/7014. --- src/internal/WixInternal.TestSupport/Builder.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/internal/WixInternal.TestSupport/Builder.cs') diff --git a/src/internal/WixInternal.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs index fa6e0064..78804826 100644 --- a/src/internal/WixInternal.TestSupport/Builder.cs +++ b/src/internal/WixInternal.TestSupport/Builder.cs @@ -25,6 +25,11 @@ namespace WixInternal.TestSupport public string SourceFolder { get; } public string[] BuildAndQuery(Action buildFunc, params string[] tables) + { + return this.BuildAndQuery(buildFunc, validate: false, tables); + } + + public string[] BuildAndQuery(Action buildFunc, bool validate, params string[] tables) { var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs"); var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl"); @@ -63,6 +68,19 @@ namespace WixInternal.TestSupport buildFunc(args.ToArray()); + if (validate) + { + args = new List + { + "msi", + "validate", + "-intermediateFolder", intermediateFolder, + outputPath, + }; + + buildFunc(args.ToArray()); + } + return Query.QueryDatabase(outputPath, tables); } } -- cgit v1.2.3-55-g6feb