diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-31 15:04:41 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-31 15:11:21 +1000 |
commit | 2ba71ab83ea951a01344e2851a1f411affc42f38 (patch) | |
tree | 18eae6ed5cd52bb7c899137b69260c0f673dfeee /src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs | |
parent | 1027b60874319e9b14d4e27c95a992835abb1403 (diff) | |
download | wix-2ba71ab83ea951a01344e2851a1f411affc42f38.tar.gz wix-2ba71ab83ea951a01344e2851a1f411affc42f38.tar.bz2 wix-2ba71ab83ea951a01344e2851a1f411affc42f38.zip |
In MSBuild tests, default to Release.
Diffstat (limited to 'src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs')
-rw-r--r-- | src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs index 6da52ed9..633fffe0 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs | |||
@@ -17,10 +17,11 @@ namespace WixToolsetTest.MSBuild | |||
17 | { | 17 | { |
18 | public static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props"); | 18 | public static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props"); |
19 | 19 | ||
20 | public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, params string[] arguments) | 20 | public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release") |
21 | { | 21 | { |
22 | var allArgs = new List<string> | 22 | var allArgs = new List<string> |
23 | { | 23 | { |
24 | $"-p:Configuration={configuration}", | ||
24 | $"-p:WixMSBuildProps={MsbuildUtilities.WixPropsPath}", | 25 | $"-p:WixMSBuildProps={MsbuildUtilities.WixPropsPath}", |
25 | // Node reuse means that child msbuild processes can stay around after the build completes. | 26 | // Node reuse means that child msbuild processes can stay around after the build completes. |
26 | // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang. | 27 | // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang. |