From a04ddca42b2070124c63a61c661e2b96a5bddac2 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 2 Jun 2020 19:45:25 +1000
Subject: Refactor the tasks so that the in-proc code is in partial classes.

---
 src/WixToolset.BuildTasks/WixBuild.cs | 46 +----------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'src/WixToolset.BuildTasks/WixBuild.cs')

diff --git a/src/WixToolset.BuildTasks/WixBuild.cs b/src/WixToolset.BuildTasks/WixBuild.cs
index c15bc2f7..b669c52b 100644
--- a/src/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/WixToolset.BuildTasks/WixBuild.cs
@@ -5,15 +5,11 @@ namespace WixToolset.BuildTasks
     using System;
     using System.Collections.Generic;
     using Microsoft.Build.Framework;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// An MSBuild task to run the WiX compiler.
     /// </summary>
-    public sealed class WixBuild : ToolsetTask
+    public sealed partial class WixBuild : ToolsetTask
     {
         public string[] Cultures { get; set; }
 
@@ -76,24 +72,8 @@ namespace WixToolset.BuildTasks
         public string[] SuppressIces { get; set; }
         public string AdditionalCub { get; set; }
 
-        protected override string TaskShortName => "WIX";
         protected override string ToolName => "wix.exe";
 
-        protected override int ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString)
-        {
-            var messaging = serviceProvider.GetService<IMessaging>();
-            messaging.SetListener(listener);
-
-            var arguments = serviceProvider.GetService<ICommandLineArguments>();
-            arguments.Populate(commandLineString);
-
-            var commandLine = serviceProvider.GetService<ICommandLine>();
-            commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions);
-            commandLine.Arguments = arguments;
-            var command = commandLine.ParseStandardCommandLine();
-            return command?.Execute() ?? -1;
-        }
-
         protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
         {
             commandLineBuilder.AppendTextUnquoted("build");
@@ -126,30 +106,6 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendFileNamesIfNotNull(this.SourceFiles, " ");
         }
 
-        private IExtensionManager CreateExtensionManagerWithStandardBackends(IWixToolsetServiceProvider serviceProvider, IMessaging messaging, string[] extensions)
-        {
-            var extensionManager = serviceProvider.GetService<IExtensionManager>();
-
-            foreach (var type in new[] { typeof(WixToolset.Core.Burn.WixToolsetStandardBackend), typeof(WixToolset.Core.WindowsInstaller.WixToolsetStandardBackend) })
-            {
-                extensionManager.Add(type.Assembly);
-            }
-
-            foreach (var extension in extensions)
-            {
-                try
-                {
-                    extensionManager.Load(extension);
-                }
-                catch (WixException e)
-                {
-                    messaging.Write(e.Error);
-                }
-            }
-
-            return extensionManager;
-        }
-
         private IEnumerable<string> CalculateBindPathStrings()
         {
             if (null != this.BindInputPaths)
-- 
cgit v1.2.3-55-g6feb