Use IWixToolsetServiceProvider and IWixToolsetCoreServiceProvider to expose the more convenient methods from WixToolsetServiceProvider without requiring casting or extension methods.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs
index d897446c..c6cd3801 100644
--- a/src/WixToolset.Core/Preprocessor.cs
+++ b/src/WixToolset.Core/Preprocessor.cs
@@ -37,14 +37,14 @@ namespace WixToolset.Core
             XmlResolver = null,
         };
 
-        internal Preprocessor(IServiceProvider serviceProvider)
+        internal Preprocessor(IWixToolsetServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
         }
 
-        private IServiceProvider ServiceProvider { get; }
+        private IWixToolsetServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
@@ -1469,7 +1469,7 @@ namespace WixToolset.Core
 
         private class ProcessingState
         {
-            public ProcessingState(IServiceProvider serviceProvider, IPreprocessContext context)
+            public ProcessingState(IWixToolsetServiceProvider serviceProvider, IPreprocessContext context)
             {
                 var path = Path.GetFullPath(context.SourcePath);