Implement support for IExtensionCommandLine and IPreprocessorExtension

1 files changed, 11 insertions, 0 deletions

diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 8693461b..d31d7355 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Core
     {
         private ExtensionManager extensionManager;
         private ParseHelper parseHelper;
+        private PreprocessHelper preprocessHelper;
         private TupleDefinitionCreator tupleDefinitionCreator;
 
         public object GetService(Type serviceType)
@@ -19,6 +20,11 @@ namespace WixToolset.Core
             if (serviceType == null) throw new ArgumentNullException(nameof(serviceType));
 
             // Transients.
+            if (serviceType == typeof(IPreprocessContext))
+            {
+                return new PreprocessContext(this);
+            }
+
             if (serviceType == typeof(ICompileContext))
             {
                 return new CompileContext(this);
@@ -65,6 +71,11 @@ namespace WixToolset.Core
                 return this.parseHelper = this.parseHelper ?? new ParseHelper(this);
             }
 
+            if (serviceType == typeof(IPreprocessHelper))
+            {
+                return this.preprocessHelper = this.preprocessHelper ?? new PreprocessHelper(this);
+            }
+
             throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
         }
     }