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

1 files changed, 5 insertions, 3 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbinder.cs b/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
index e8c109d2..2ca0b557 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
@@ -2,11 +2,11 @@
 
 namespace WixToolset.Core
 {
-    using System.Collections;
+    using System.Collections.Generic;
     using System.IO;
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using System.Collections.Generic;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Unbinder core of the WiX toolset.
@@ -21,6 +21,8 @@ namespace WixToolset.Core
         /// <value>Set to true if the input msi is part of an admin image.</value>
         public bool IsAdminImage { get; set; }
 
+        public IWixToolsetServiceProvider ServiceProvider { get; }
+
         /// <summary>
         /// Gets or sets the option to suppress demodularizing values.
         /// </summary>
@@ -64,7 +66,7 @@ namespace WixToolset.Core
             // if we don't have the temporary files object yet, get one
             Directory.CreateDirectory(this.TempFilesLocation); // ensure the base path is there
 
-            var context = new UnbindContext();
+            var context = new UnbindContext(this.ServiceProvider);
             context.InputFilePath = file;
             context.ExportBasePath = exportBasePath;
             context.IntermediateFolder = this.TempFilesLocation;