Extract running wix.exe in task to WixExeBaseTask class

3 files changed, 14 insertions, 4 deletions

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/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/WixBuild_InProc.cs b/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs
index 9cba0f62..cda5f57f 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild_InProc.cs
+++ b/src/wix/WixToolset.BuildTasks/WixExeBaseTask_Inproc.cs
@@ -10,7 +10,7 @@ namespace WixToolset.BuildTasks
     using WixToolset.Core.WindowsInstaller;
     using WixToolset.Extensibility.Services;
 
-    public partial class WixBuild
+    public abstract partial class WixExeBaseTask
     {
         protected override string TaskShortName => "WIX";