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.

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 @@
         SuppressIces="$(SuppressIces)"
         AdditionalCub="$(AdditionalCub)"
 
-        RunAsSeparateProcess="false"
+        RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
         ToolExe="$(WixToolExe)"
         ToolPath="$(WixToolDir)" />
 
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
 
         [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");