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/ExtensibilityServices/BackendHelper.cs   |  2 +-
 src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs     |  4 ++--
 .../ExtensibilityServices/PreprocessHelper.cs                | 12 ++++++------
 .../ExtensibilityServices/SymbolDefinitionCreator.cs         |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs
index 3dcc0ce9..539cec78 100644
--- a/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.ExtensibilityServices
     {
         private static readonly string[] ReservedFileNames = { "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
 
-        public BackendHelper(IWixToolsetServiceProvider serviceProvider)
+        public BackendHelper(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 3c040b35..8e9f48c4 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -18,14 +18,14 @@ namespace WixToolset.Core.ExtensibilityServices
     {
         private static readonly char[] InlineDirectorySeparators = new char[] { ':', '\\', '/' };
 
-        public ParseHelper(IWixToolsetServiceProvider serviceProvider)
+        public ParseHelper(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 041c7d5d..b0c87bcf 100644
--- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -17,14 +17,14 @@ namespace WixToolset.Core.ExtensibilityServices
         private static readonly char[] VariableSplitter = new char[] { '.' };
         private static readonly char[] ArgumentSplitter = new char[] { ',' };
 
-        public PreprocessHelper(IWixToolsetServiceProvider serviceProvider)
+        public PreprocessHelper(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
@@ -133,7 +133,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     }
 
                 default:
-                    var extensionsByPrefix = this.GetExtensionsByPrefix(context);
+                    var extensionsByPrefix = this.GetExtensionsByPrefix();
                     if (extensionsByPrefix.TryGetValue(prefix, out var extension))
                     {
                         try
@@ -259,7 +259,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     return context.Variables.TryGetValue(name, out var result) ? result : null;
 
                 default:
-                    var extensionsByPrefix = this.GetExtensionsByPrefix(context);
+                    var extensionsByPrefix = this.GetExtensionsByPrefix();
                     if (extensionsByPrefix.TryGetValue(prefix, out var extension))
                     {
                         try
@@ -309,7 +309,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     break;
 
                 default:
-                    var extensionsByPrefix = this.GetExtensionsByPrefix(context);
+                    var extensionsByPrefix = this.GetExtensionsByPrefix();
                     if (extensionsByPrefix.TryGetValue(prefix, out var extension))
                     {
                         if (!extension.ProcessPragma(prefix, pragma, args, parent))
@@ -468,7 +468,7 @@ namespace WixToolset.Core.ExtensibilityServices
             }
         }
 
-        private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix(IPreprocessContext context)
+        private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix()
         {
             if (this.ExtensionsByPrefix == null)
             {
diff --git a/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs b/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
index 2bff21d6..a2486130 100644
--- a/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
@@ -10,12 +10,12 @@ namespace WixToolset.Core.ExtensibilityServices
 
     internal class SymbolDefinitionCreator : ISymbolDefinitionCreator
     {
-        public SymbolDefinitionCreator(IWixToolsetServiceProvider serviceProvider)
+        public SymbolDefinitionCreator(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IEnumerable<IExtensionData> ExtensionData { get; set; }
 
-- 
cgit v1.2.3-55-g6feb