Update service provider dependency
Bob Arnson committed
Mar 15, 2021 at 20:47 UTC
30ae681ff76799c1aea8821cbe4c8de292c59ddd
5 files changed
+5
-2
src/WixToolset.BuildTasks/WixBuild_InProc.cs
+1
@@ -3,6 +3,7 @@
3
#if !NETCOREAPP
4
namespace WixToolset.BuildTasks
5
{
6
+ using System;
7
using System.Threading;
8
using System.Threading.Tasks;
9
using WixToolset.Core.Burn;
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+1
@@ -19,6 +19,7 @@
19
20
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
21
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
22
+ <PackageReference Include="WixToolset.Core" Version="4.0.*" />
23
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
24
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
25
</ItemGroup>
src/heat/Program.cs
+1
-1
@@ -62,7 +62,7 @@ namespace WixToolset.Tools.Heat
62
/// <param name="serviceProvider">Service provider to use throughout this execution.</param>
63
/// <param name="args">The commandline arguments.</param>
64
/// <returns>Returns the application error code.</returns>
65
- public Task<int> Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args)
65
+ public Task<int> Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args)
66
{
67
var messaging = serviceProvider.GetService<IMessaging>();
68
messaging.SetListener(listener);
src/wix/Program.cs
+1
-1
@@ -79,7 +79,7 @@ namespace WixToolset.Tools
79
/// <param name="args">Command-line arguments to execute.</param>
80
/// <param name="cancellationToken">Cancellation token.</param>
81
/// <returns>Returns the application error code.</returns>
82
- public static Task<int> Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args, CancellationToken cancellationToken)
82
+ public static Task<int> Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args, CancellationToken cancellationToken)
83
{
84
var messaging = serviceProvider.GetService<IMessaging>();
85
messaging.SetListener(listener);
src/wix/wix.csproj
+1
@@ -26,6 +26,7 @@
26
27
<ItemGroup>
28
<PackageReference Include="WixToolset.Converters" Version="4.0.*" />
29
+ <PackageReference Include="WixToolset.Core" Version="4.0.*" />
30
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
31
<PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" />
32
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />