Never run in-proc on .NET Core.

1 files changed, 44 insertions, 2 deletions

diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs
index 6a6f32e0..90c3194b 100644
--- a/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs
@@ -5,10 +5,12 @@ namespace WixToolsetTest.MSBuild
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Linq;
     using WixBuildTools.TestSupport;
 
     public enum BuildSystem
     {
+        DotNetCoreSdk,
         MSBuild,
         MSBuild64,
     }
@@ -17,12 +19,13 @@ namespace WixToolsetTest.MSBuild
     {
         public static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
 
-        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null)
+        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal")
         {
             var allArgs = new List<string>
             {
+                $"-verbosity:{verbosityLevel}",
                 $"-p:Configuration={configuration}",
-                $"-p:WixMSBuildProps={MsbuildUtilities.WixPropsPath}",
+                GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath),
                 // Node reuse means that child msbuild processes can stay around after the build completes.
                 // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang.
                 "-nr:false",
@@ -40,6 +43,16 @@ namespace WixToolsetTest.MSBuild
 
             switch (buildSystem)
             {
+                case BuildSystem.DotNetCoreSdk:
+                    {
+                        allArgs.Add(projectPath);
+                        var result = DotnetRunner.Execute("msbuild", allArgs.ToArray());
+                        return new MsbuildRunnerResult
+                        {
+                            ExitCode = result.ExitCode,
+                            Output = result.StandardOutput,
+                        };
+                    }
                 case BuildSystem.MSBuild:
                 case BuildSystem.MSBuild64:
                     {
@@ -51,5 +64,34 @@ namespace WixToolsetTest.MSBuild
                     }
             }
         }
+
+        public static string GetQuotedPropertySwitch(BuildSystem buildSystem, string propertyName, string valueToQuote)
+        {
+            switch (buildSystem)
+            {
+                case BuildSystem.DotNetCoreSdk:
+                    {
+                        return $"-p:{propertyName}=\\\"{valueToQuote}\\\"";
+                    }
+                case BuildSystem.MSBuild:
+                case BuildSystem.MSBuild64:
+                    {
+                        return $"-p:{propertyName}=\"{valueToQuote}\"";
+                    }
+                default:
+                    {
+                        throw new NotImplementedException();
+                    }
+            }
+        }
+
+        public static IEnumerable<string> GetToolCommandLines(MsbuildRunnerResult result, string toolName, string operation, BuildSystem buildSystem, bool? outOfProc = null)
+        {
+            var expectedOutOfProc = buildSystem == BuildSystem.DotNetCoreSdk || outOfProc.HasValue && outOfProc.Value;
+            var expectedToolExe = !expectedOutOfProc ? $"({toolName}.exe)" :
+                                  buildSystem == BuildSystem.DotNetCoreSdk ? $"{toolName}.dll\"" : $"{toolName}.exe";
+            var expectedToolCommand = $"{expectedToolExe} {operation}";
+            return result.Output.Where(line => line.Contains(expectedToolCommand));
+        }
     }
 }