From cec50194881e99d1f3ef1c8a2537e2eb0c124d75 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 8 Jan 2022 07:21:43 -0800
Subject: Extract running wix.exe in task to WixExeBaseTask class

---
 src/wix/WixToolset.BuildTasks/WixBuild.cs          |  4 +---
 src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs   | 28 ----------------------
 src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs    | 12 ++++++++++
 .../WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs | 28 ++++++++++++++++++++++
 4 files changed, 41 insertions(+), 31 deletions(-)
 delete mode 100644 src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs
 create mode 100644 src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs
 create mode 100644 src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs

diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index 3d4617f6..2d35c391 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -9,7 +9,7 @@ namespace WixToolset.BuildTasks
     /// <summary>
     /// An MSBuild task to run the WiX compiler.
     /// </summary>
-    public sealed partial class WixBuild : ToolsetTask
+    public sealed partial class WixBuild : WixExeBaseTask
     {
         public string[] Cultures { get; set; }
 
@@ -72,8 +72,6 @@ namespace WixToolset.BuildTasks
 
         public string AdditionalCub { get; set; }
 
-        protected override string ToolName => "wix.exe";
-
         protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
         {
             commandLineBuilder.AppendTextUnquoted("build");
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs b/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs
deleted file mode 100644
index 9cba0f62..00000000
--- a/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-#if !NETCOREAPP
-namespace WixToolset.BuildTasks
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using WixToolset.Core.Burn;
-    using WixToolset.Core.WindowsInstaller;
-    using WixToolset.Extensibility.Services;
-
-    public partial class WixBuild
-    {
-        protected override string TaskShortName => "WIX";
-
-        protected override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider coreProvider, string commandLineString, CancellationToken cancellationToken)
-        {
-            coreProvider.AddWindowsInstallerBackend()
-                        .AddBundleBackend();
-
-            var commandLine = coreProvider.GetService<ICommandLine>();
-            var command = commandLine.CreateCommand(commandLineString);
-            return command?.ExecuteAsync(cancellationToken) ?? Task.FromResult(1);
-        }
-    }
-}
-#endif
diff --git a/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs b/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs
new file mode 100644
index 00000000..c1904213
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/WixExeBaseTask.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.BuildTasks
+{
+    /// <summary>
+    /// An MSBuild task to run WiX to update cabinet signatures in a MSI.
+    /// </summary>
+    public abstract partial class WixExeBaseTask : ToolsetTask
+    {
+        protected override string ToolName => "wix.exe";
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs b/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs
new file mode 100644
index 00000000..cda5f57f
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs
@@ -0,0 +1,28 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#if !NETCOREAPP
+namespace WixToolset.BuildTasks
+{
+    using System;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using WixToolset.Core.Burn;
+    using WixToolset.Core.WindowsInstaller;
+    using WixToolset.Extensibility.Services;
+
+    public abstract partial class WixExeBaseTask
+    {
+        protected override string TaskShortName => "WIX";
+
+        protected override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider coreProvider, string commandLineString, CancellationToken cancellationToken)
+        {
+            coreProvider.AddWindowsInstallerBackend()
+                        .AddBundleBackend();
+
+            var commandLine = coreProvider.GetService<ICommandLine>();
+            var command = commandLine.CreateCommand(commandLineString);
+            return command?.ExecuteAsync(cancellationToken) ?? Task.FromResult(1);
+        }
+    }
+}
+#endif
-- 
cgit v1.2.3-55-g6feb