2 files changed, 7 insertions, 5 deletions

diff --git a/src/heat/Program.cs b/src/heat/Program.cs
index 38d6d401..30a82511 100644
--- a/src/heat/Program.cs
+++ b/src/heat/Program.cs
@@ -4,6 +4,8 @@ namespace WixToolset.Tools.Heat
 {
     using System;
     using System.Runtime.InteropServices;
+    using System.Threading;
+    using System.Threading.Tasks;
     using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
@@ -23,7 +25,7 @@ namespace WixToolset.Tools.Heat
         /// <param name="args">Commandline arguments for the application.</param>
         /// <returns>Returns the application error code.</returns>
         [MTAThread]
-        public static int Main(string[] args)
+        public static async Task<int> Main(string[] args)
         {
             var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
             var listener = new ConsoleMessageListener("HEAT", "heat.exe");
@@ -31,7 +33,7 @@ namespace WixToolset.Tools.Heat
             try
             {
                 var program = new Program();
-                return program.Run(serviceProvider, listener, args);
+                return await program.Run(serviceProvider, listener, args);
             }
             catch (WixException e)
             {
@@ -58,7 +60,7 @@ namespace WixToolset.Tools.Heat
         /// <param name="serviceProvider">Service provider to use throughout this execution.</param>
         /// <param name="args">The commandline arguments.</param>
         /// <returns>Returns the application error code.</returns>
-        public int Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args)
+        public Task<int> Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args)
         {
             var messaging = serviceProvider.GetService<IMessaging>();
             messaging.SetListener(listener);
@@ -68,7 +70,7 @@ namespace WixToolset.Tools.Heat
 
             var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider);
             var command = commandLine.ParseStandardCommandLine(arguments);
-            return command?.Execute() ?? 1;
+            return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1);
         }
     }
 }
diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj
index 9d6eeaa7..bdcb4e3b 100644
--- a/src/heat/heat.csproj
+++ b/src/heat/heat.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
+    <Compile Include="..\wix\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
   </ItemGroup>
 
   <ItemGroup>