diff options
author | Rob Mensching <rob@firegiant.com> | 2022-02-07 21:28:07 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-02-08 09:42:04 -0800 |
commit | 24e8f28dc9bea0a72a82abc6cafebe2364c94ef1 (patch) | |
tree | d4fedc72d9e24e9ea347ce703b930804227845a6 /src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs | |
parent | 6f97699cc2bbcd5395590a77df43583103f71e54 (diff) | |
download | wix-24e8f28dc9bea0a72a82abc6cafebe2364c94ef1.tar.gz wix-24e8f28dc9bea0a72a82abc6cafebe2364c94ef1.tar.bz2 wix-24e8f28dc9bea0a72a82abc6cafebe2364c94ef1.zip |
Make validation independent of the build command
In MSBuild this adds a new WindowsInstallerValidation target that
automatically runs validation after a successful build. From the
command-line the "wix msi" command gets a "validate" subcommand that
will validate an MSI or MSM file.
Diffstat (limited to 'src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs')
-rw-r--r-- | src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs index 28e0c219..875e3279 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs | |||
@@ -20,12 +20,13 @@ namespace WixToolsetTest.Sdk | |||
20 | public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk"); | 20 | public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk"); |
21 | public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props"); | 21 | public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props"); |
22 | 22 | ||
23 | public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal") | 23 | public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true) |
24 | { | 24 | { |
25 | var allArgs = new List<string> | 25 | var allArgs = new List<string> |
26 | { | 26 | { |
27 | $"-verbosity:{verbosityLevel}", | 27 | $"-verbosity:{verbosityLevel}", |
28 | $"-p:Configuration={configuration}", | 28 | $"-p:Configuration={configuration}", |
29 | $"-p:SuppressValidation={suppressValidation}", | ||
29 | GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath), | 30 | GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath), |
30 | // Node reuse means that child msbuild processes can stay around after the build completes. | 31 | // Node reuse means that child msbuild processes can stay around after the build completes. |
31 | // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang. | 32 | // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang. |