From 30ae681ff76799c1aea8821cbe4c8de292c59ddd Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 15 Mar 2021 20:47:34 -0400
Subject: Update service provider dependency

---
 src/WixToolset.BuildTasks/WixBuild_InProc.cs           | 1 +
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 1 +
 src/heat/Program.cs                                    | 2 +-
 src/wix/Program.cs                                     | 2 +-
 src/wix/wix.csproj                                     | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/WixToolset.BuildTasks/WixBuild_InProc.cs b/src/WixToolset.BuildTasks/WixBuild_InProc.cs
index a45d2369..9cba0f62 100644
--- a/src/WixToolset.BuildTasks/WixBuild_InProc.cs
+++ b/src/WixToolset.BuildTasks/WixBuild_InProc.cs
@@ -3,6 +3,7 @@
 #if !NETCOREAPP
 namespace WixToolset.BuildTasks
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using WixToolset.Core.Burn;
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 6f43bae5..e4dfaf2f 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -19,6 +19,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)'=='net461'">
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
+    <PackageReference Include="WixToolset.Core" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
   </ItemGroup>
diff --git a/src/heat/Program.cs b/src/heat/Program.cs
index 9f95e0bc..d0bcf19f 100644
--- a/src/heat/Program.cs
+++ b/src/heat/Program.cs
@@ -62,7 +62,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 Task<int> Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args)
+        public Task<int> Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args)
         {
             var messaging = serviceProvider.GetService<IMessaging>();
             messaging.SetListener(listener);
diff --git a/src/wix/Program.cs b/src/wix/Program.cs
index 86a1d4d9..d1818df0 100644
--- a/src/wix/Program.cs
+++ b/src/wix/Program.cs
@@ -79,7 +79,7 @@ namespace WixToolset.Tools
         /// <param name="args">Command-line arguments to execute.</param>
         /// <param name="cancellationToken">Cancellation token.</param>
         /// <returns>Returns the application error code.</returns>
-        public static Task<int> Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args, CancellationToken cancellationToken)
+        public static Task<int> Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args, CancellationToken cancellationToken)
         {
             var messaging = serviceProvider.GetService<IMessaging>();
             messaging.SetListener(listener);
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 0552c28a..f414bf41 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -26,6 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Converters" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
-- 
cgit v1.2.3-55-g6feb