From e8ebab2ce3991c3abb9942ce48a026a2169df01e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 14 Mar 2021 11:20:54 -0700
Subject: Remove use of removed IWixToolsetServiceProvider

---
 src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs      | 2 +-
 src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs          | 4 ++--
 src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs    | 4 ++--
 .../ExtensibilityServices/WindowsInstallerBackendHelper.cs            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller')

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index b6244a6e..df1c824a 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -55,7 +55,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.BackendExtensions = backendExtension;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
index e47e5b64..875b46c2 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
     internal class CabinetResolver
     {
-        public CabinetResolver(IWixToolsetServiceProvider serviceProvider, string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
+        public CabinetResolver(IServiceProvider serviceProvider, string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
         {
             this.ServiceProvider = serviceProvider;
 
@@ -23,7 +23,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.BackendExtensions = backendExtensions;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private string CabCachePath { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index 43afd718..d4faabeb 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -31,7 +31,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private Dictionary<string, string> lastCabinetAddedToMediaTable; // Key is First Cabinet Name, Value is Last Cabinet Added in the Split Sequence
 
-        public CreateCabinetsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate)
+        public CreateCabinetsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate)
         {
             this.fileTransfers = new List<IFileTransfer>();
 
@@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.MediaTemplate = mediaTemplate;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IBackendHelper BackendHelper { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
index 18060ca7..ca1cd0e3 100644
--- a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices
     {
         private readonly IBackendHelper backendHelper;
 
-        public WindowsInstallerBackendHelper(IWixToolsetServiceProvider serviceProvider)
+        public WindowsInstallerBackendHelper(IServiceProvider serviceProvider)
         {
             this.backendHelper = serviceProvider.GetService<IBackendHelper>();
         }
-- 
cgit v1.2.3-55-g6feb