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/ExtensibilityServices/TupleDefinitionCreator.cs b/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs
index aeeeebe7..7ef72afc 100644
--- a/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs
@@ -10,12 +10,12 @@ namespace WixToolset.Core.ExtensibilityServices
 
     internal class TupleDefinitionCreator : ITupleDefinitionCreator
     {
-        public TupleDefinitionCreator(IServiceProvider serviceProvider)
+        public TupleDefinitionCreator(IWixToolsetServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        private IServiceProvider ServiceProvider { get; }
+        private IWixToolsetServiceProvider ServiceProvider { get; }
 
         private IEnumerable<IExtensionData> ExtensionData { get; set; }
 
@@ -62,7 +62,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
         private void LoadExtensionData()
         {
-            var extensionManager = (IExtensionManager)this.ServiceProvider.GetService(typeof(IExtensionManager));
+            var extensionManager = this.ServiceProvider.GetService<IExtensionManager>();
 
             this.ExtensionData = extensionManager.GetServices<IExtensionData>();
         }