diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.MSBuild/tools/wix.targets | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs | 10 |
2 files changed, 6 insertions, 6 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 | ||
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs index aecc607a..163e8402 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs | |||
| @@ -291,11 +291,11 @@ namespace WixToolsetTest.MSBuild | |||
| 291 | 291 | ||
| 292 | [Theory] | 292 | [Theory] |
| 293 | [InlineData(BuildSystem.DotNetCoreSdk, null)] | 293 | [InlineData(BuildSystem.DotNetCoreSdk, null)] |
| 294 | //[InlineData(BuildSystem.DotNetCoreSdk, true)] | 294 | [InlineData(BuildSystem.DotNetCoreSdk, true)] |
| 295 | [InlineData(BuildSystem.MSBuild, null)] | 295 | [InlineData(BuildSystem.MSBuild, null)] |
| 296 | //[InlineData(BuildSystem.MSBuild, true)] | 296 | [InlineData(BuildSystem.MSBuild, true)] |
| 297 | [InlineData(BuildSystem.MSBuild64, null)] | 297 | [InlineData(BuildSystem.MSBuild64, null)] |
| 298 | //[InlineData(BuildSystem.MSBuild64, true)] | 298 | [InlineData(BuildSystem.MSBuild64, true)] |
| 299 | public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc) | 299 | public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc) |
| 300 | { | 300 | { |
| 301 | var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); | 301 | var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); |
| @@ -381,8 +381,8 @@ namespace WixToolsetTest.MSBuild | |||
| 381 | 381 | ||
| 382 | [Theory] | 382 | [Theory] |
| 383 | [InlineData(BuildSystem.DotNetCoreSdk)] | 383 | [InlineData(BuildSystem.DotNetCoreSdk)] |
| 384 | //[InlineData(BuildSystem.MSBuild)] | 384 | [InlineData(BuildSystem.MSBuild)] |
| 385 | //[InlineData(BuildSystem.MSBuild64)] | 385 | [InlineData(BuildSystem.MSBuild64)] |
| 386 | public void ReportsInnerExceptionForUnexpectedExceptions(BuildSystem buildSystem) | 386 | public void ReportsInnerExceptionForUnexpectedExceptions(BuildSystem buildSystem) |
| 387 | { | 387 | { |
| 388 | var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); | 388 | var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); |
