From e7f2e4b4912012bbade5d562345d8467eb6b658a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 3 Jun 2020 15:18:24 +1000 Subject: Disable RunAsSeparateProcess until build server issues are resolved. --- src/WixToolset.MSBuild/tools/wix.targets | 2 +- src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/WixToolset.MSBuild/tools/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets index 6914d03e..233acef0 100644 --- a/src/WixToolset.MSBuild/tools/wix.targets +++ b/src/WixToolset.MSBuild/tools/wix.targets @@ -692,7 +692,7 @@ SuppressIces="$(SuppressIces)" AdditionalCub="$(AdditionalCub)" - RunAsSeparateProcess="$(RunWixToolsOutOfProc)" + RunAsSeparateProcess="false" ToolExe="$(WixToolExe)" ToolPath="$(WixToolDir)" /> diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs index 163e8402..aecc607a 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs @@ -291,11 +291,11 @@ namespace WixToolsetTest.MSBuild [Theory] [InlineData(BuildSystem.DotNetCoreSdk, null)] - [InlineData(BuildSystem.DotNetCoreSdk, true)] + //[InlineData(BuildSystem.DotNetCoreSdk, true)] [InlineData(BuildSystem.MSBuild, null)] - [InlineData(BuildSystem.MSBuild, true)] + //[InlineData(BuildSystem.MSBuild, true)] [InlineData(BuildSystem.MSBuild64, null)] - [InlineData(BuildSystem.MSBuild64, true)] + //[InlineData(BuildSystem.MSBuild64, true)] public void CanBuildSimpleMsiPackageAsWixipl(BuildSystem buildSystem, bool? outOfProc) { var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); @@ -381,8 +381,8 @@ namespace WixToolsetTest.MSBuild [Theory] [InlineData(BuildSystem.DotNetCoreSdk)] - [InlineData(BuildSystem.MSBuild)] - [InlineData(BuildSystem.MSBuild64)] + //[InlineData(BuildSystem.MSBuild)] + //[InlineData(BuildSystem.MSBuild64)] public void ReportsInnerExceptionForUnexpectedExceptions(BuildSystem buildSystem) { var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); -- cgit v1.2.3-55-g6feb