diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-03 20:12:17 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-03 20:18:46 +1000 |
| commit | ff881bbb67a85db1878add8e7795a263dbb78633 (patch) | |
| tree | 88b18faf777dc898c9959e8d6e0120450dfbba9e /src/WixToolset.MSBuild/tools | |
| parent | e7f2e4b4912012bbade5d562345d8467eb6b658a (diff) | |
| download | wix-ff881bbb67a85db1878add8e7795a263dbb78633.tar.gz wix-ff881bbb67a85db1878add8e7795a263dbb78633.tar.bz2 wix-ff881bbb67a85db1878add8e7795a263dbb78633.zip | |
Reenable RunAsSeparateProcess.
Publish the parts of WixToolset.MSBuild to individual folders and then manually recombine them, because otherwise dotnet publish was mysteriously bringing in the wrong versions of dlls.
Disable tests in appveyor.yml because Appveyor was running the tests again at the end of the build.
Diffstat (limited to 'src/WixToolset.MSBuild/tools')
| -rw-r--r-- | src/WixToolset.MSBuild/tools/wix.targets | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.MSBuild/tools/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets index 233acef0..6914d03e 100644 --- a/src/WixToolset.MSBuild/tools/wix.targets +++ b/src/WixToolset.MSBuild/tools/wix.targets | |||
| @@ -692,7 +692,7 @@ | |||
| 692 | SuppressIces="$(SuppressIces)" | 692 | SuppressIces="$(SuppressIces)" |
| 693 | AdditionalCub="$(AdditionalCub)" | 693 | AdditionalCub="$(AdditionalCub)" |
| 694 | 694 | ||
| 695 | RunAsSeparateProcess="false" | 695 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" |
| 696 | ToolExe="$(WixToolExe)" | 696 | ToolExe="$(WixToolExe)" |
| 697 | ToolPath="$(WixToolDir)" /> | 697 | ToolPath="$(WixToolDir)" /> |
| 698 | 698 | ||