diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-01 21:58:44 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-03 14:24:34 +1000 |
| commit | 82a26a321bae36e38743f50f38887387a392ce24 (patch) | |
| tree | d5a562d5f370b674815711eb29d4415405f28d93 /src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs | |
| parent | 2ba71ab83ea951a01344e2851a1f411affc42f38 (diff) | |
| download | wix-82a26a321bae36e38743f50f38887387a392ce24.tar.gz wix-82a26a321bae36e38743f50f38887387a392ce24.tar.bz2 wix-82a26a321bae36e38743f50f38887387a392ce24.zip | |
Add ability for net461 tasks to run the tool out of proc.
Diffstat (limited to 'src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs')
| -rw-r--r-- | src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs index 633fffe0..6a6f32e0 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs | |||
| @@ -17,7 +17,7 @@ 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, string[] arguments = null, string configuration = "Release") | 20 | public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null) |
| 21 | { | 21 | { |
| 22 | var allArgs = new List<string> | 22 | var allArgs = new List<string> |
| 23 | { | 23 | { |
| @@ -28,6 +28,11 @@ namespace WixToolsetTest.MSBuild | |||
| 28 | "-nr:false", | 28 | "-nr:false", |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | if (outOfProc.HasValue) | ||
| 32 | { | ||
| 33 | allArgs.Add($"-p:RunWixToolsOutOfProc={outOfProc.Value}"); | ||
| 34 | } | ||
| 35 | |||
| 31 | if (arguments != null) | 36 | if (arguments != null) |
| 32 | { | 37 | { |
| 33 | allArgs.AddRange(arguments); | 38 | allArgs.AddRange(arguments); |
