diff options
author | Bob Arnson <bob@firegiant.com> | 2022-11-14 17:21:54 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2022-11-14 18:27:27 -0500 |
commit | 5b208b133e6970f4af247b7d13bd198637b4552b (patch) | |
tree | ca397112da13a9ab53270191bdef2cbb17b8f96f /src/internal/WixInternal.TestSupport/Builder.cs | |
parent | 5e5c542f75a33c0fb8b0ce50f6d66a310bf37ee7 (diff) | |
download | wix-5b208b133e6970f4af247b7d13bd198637b4552b.tar.gz wix-5b208b133e6970f4af247b7d13bd198637b4552b.tar.bz2 wix-5b208b133e6970f4af247b7d13bd198637b4552b.zip |
Fix Iis table definitions.
Fixes https://github.com/wixtoolset/issues/issues/7014.
Diffstat (limited to '')
-rw-r--r-- | src/internal/WixInternal.TestSupport/Builder.cs | 18 |
1 files changed, 18 insertions, 0 deletions
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 | |||
@@ -26,6 +26,11 @@ namespace WixInternal.TestSupport | |||
26 | 26 | ||
27 | public string[] BuildAndQuery(Action<string[]> buildFunc, params string[] tables) | 27 | public string[] BuildAndQuery(Action<string[]> buildFunc, params string[] tables) |
28 | { | 28 | { |
29 | return this.BuildAndQuery(buildFunc, validate: false, tables); | ||
30 | } | ||
31 | |||
32 | public string[] BuildAndQuery(Action<string[]> buildFunc, bool validate, params string[] tables) | ||
33 | { | ||
29 | var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs"); | 34 | var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs"); |
30 | var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl"); | 35 | var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl"); |
31 | 36 | ||
@@ -63,6 +68,19 @@ namespace WixInternal.TestSupport | |||
63 | 68 | ||
64 | buildFunc(args.ToArray()); | 69 | buildFunc(args.ToArray()); |
65 | 70 | ||
71 | if (validate) | ||
72 | { | ||
73 | args = new List<string> | ||
74 | { | ||
75 | "msi", | ||
76 | "validate", | ||
77 | "-intermediateFolder", intermediateFolder, | ||
78 | outputPath, | ||
79 | }; | ||
80 | |||
81 | buildFunc(args.ToArray()); | ||
82 | } | ||
83 | |||
66 | return Query.QueryDatabase(outputPath, tables); | 84 | return Query.QueryDatabase(outputPath, tables); |
67 | } | 85 | } |
68 | } | 86 | } |