Refactor CompilerCore to ParserHelper and other clean up

1 files changed, 7 insertions, 0 deletions

diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index dd49e7ed..8693461b 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Core
 {
     using System;
+    using WixToolset.Core.ExtensibilityServices;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
@@ -10,6 +11,7 @@ namespace WixToolset.Core
     public class WixToolsetServiceProvider : IServiceProvider
     {
         private ExtensionManager extensionManager;
+        private ParseHelper parseHelper;
         private TupleDefinitionCreator tupleDefinitionCreator;
 
         public object GetService(Type serviceType)
@@ -58,6 +60,11 @@ namespace WixToolset.Core
                 return this.tupleDefinitionCreator = this.tupleDefinitionCreator ?? new TupleDefinitionCreator(this);
             }
 
+            if (serviceType == typeof(IParseHelper))
+            {
+                return this.parseHelper = this.parseHelper ?? new ParseHelper(this);
+            }
+
             throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
         }
     }