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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index d4a03d82..1342444f 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Core
     /// </summary>
     internal class Resolver : IResolver
     {
-        internal Resolver(IServiceProvider serviceProvider)
+        internal Resolver(IWixToolsetServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
@@ -26,7 +26,7 @@ namespace WixToolset.Core
             this.VariableResolver = serviceProvider.GetService<IVariableResolver>();
         }
 
-        private IServiceProvider ServiceProvider { get; }
+        private IWixToolsetServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }