From e8ebab2ce3991c3abb9942ce48a026a2169df01e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 14 Mar 2021 11:20:54 -0700 Subject: Remove use of removed IWixToolsetServiceProvider --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 2 +- src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs | 2 +- src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs | 2 +- src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/WixToolset.Core.Burn') diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index 34c72346..7b5a3174 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -45,7 +45,7 @@ namespace WixToolset.Core.Burn this.BackendExtensions = backedExtensions; } - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; } diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs index dc1a1913..c8867eb7 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs @@ -23,7 +23,7 @@ namespace WixToolset.Core.Burn.Bundles { private const string PropertySqlFormat = "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'"; - public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary payloadSymbols) + public ProcessMsiPackageCommand(IServiceProvider serviceProvider, IEnumerable backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary payloadSymbols) { this.Messaging = serviceProvider.GetService(); this.BackendHelper = serviceProvider.GetService(); diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs index dea5b336..adbb41b1 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs @@ -15,7 +15,7 @@ namespace WixToolset.Core.Burn.Bundles internal class ProcessPayloadsCommand { - public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IPayloadHarvester payloadHarvester, IEnumerable payloads, PackagingType defaultPackaging, string layoutDirectory) + public ProcessPayloadsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper, IPayloadHarvester payloadHarvester, IEnumerable payloads, PackagingType defaultPackaging, string layoutDirectory) { this.Messaging = serviceProvider.GetService(); diff --git a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs index 5502b43b..a4f37d10 100644 --- a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs +++ b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs @@ -25,7 +25,7 @@ namespace WixToolset.Core.Burn.ExtensibilityServices private Dictionary BundleExtensionDataById { get; } = new Dictionary(); - public BurnBackendHelper(IWixToolsetServiceProvider serviceProvider) + public BurnBackendHelper(IServiceProvider serviceProvider) { this.backendHelper = serviceProvider.GetService(); } -- cgit v1.2.3-55-g6feb