From 48e039f95bf1e725d74f2361e4a0bc60154b9c93 Mon Sep 17 00:00:00 2001
From: Hank McCord <hymccord@gmail.com>
Date: Sun, 29 Aug 2021 14:06:20 -0400
Subject: Fix heat not using passed in extensions

Fixes: wixtoolset/issues#6564
---
 src/wix/heat/Program.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wix/heat/Program.cs b/src/wix/heat/Program.cs
index d0bcf19f..0b602f76 100644
--- a/src/wix/heat/Program.cs
+++ b/src/wix/heat/Program.cs
@@ -13,6 +13,7 @@ namespace WixToolset.Tools.Heat
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
     using WixToolset.Harvesters;
+    using WixToolset.Harvesters.Extensibility;
     using WixToolset.Tools.Core;
 
     /// <summary>
@@ -70,7 +71,14 @@ namespace WixToolset.Tools.Heat
             var arguments = serviceProvider.GetService<ICommandLineArguments>();
             arguments.Populate(args);
 
-            var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider);
+            var extensionManager = serviceProvider.GetService<IExtensionManager>();
+            foreach (var extension in arguments.Extensions)
+            {
+                extensionManager.Load(extension);
+            }
+            var heatExtensions = extensionManager.GetServices<IHeatExtension>();
+
+            var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, heatExtensions);
             var command = commandLine.ParseStandardCommandLine(arguments);
             return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1);
         }
-- 
cgit v1.2.3-55-g6feb