Standardize creation of public objects in move towards interfaces

1 files changed, 13 insertions, 29 deletions

diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index f0ff5b1a..123318f5 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -4,28 +4,21 @@ namespace WixToolset.Core.CommandLine
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
 
     internal class CompileCommand : ICommandLineCommand
     {
-        public CompileCommand(IServiceProvider serviceProvider, IMessaging messaging, IExtensionManager extensions, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables)
+        public CompileCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables)
         {
             this.PreprocessorVariables = preprocessorVariables;
             this.ServiceProvider = serviceProvider;
-            this.Messaging = messaging;
-            this.ExtensionManager = extensions;
             this.SourceFiles = sources;
         }
 
         private IServiceProvider ServiceProvider { get; }
 
-        private IMessaging Messaging { get; }
-
-        private IExtensionManager ExtensionManager { get; }
-
         public IEnumerable<string> IncludeSearchPaths { get; }
 
         private IEnumerable<SourceFile> SourceFiles { get; }
@@ -36,27 +29,18 @@ namespace WixToolset.Core.CommandLine
         {
             foreach (var sourceFile in this.SourceFiles)
             {
-                var preprocessContext = this.ServiceProvider.GetService<IPreprocessContext>();
-                preprocessContext.Messaging = this.Messaging;
-                preprocessContext.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>();
-                preprocessContext.Platform = Platform.X86; // TODO: set this correctly
-                preprocessContext.IncludeSearchPaths = this.IncludeSearchPaths?.ToList() ?? new List<string>();
-                preprocessContext.SourceFile = sourceFile.SourcePath;
-                preprocessContext.Variables = new Dictionary<string, string>(this.PreprocessorVariables);
-
-                var preprocessor = new Preprocessor();
-                var document = preprocessor.Process(preprocessContext);
-
-                var compileContext = this.ServiceProvider.GetService<ICompileContext>();
-                compileContext.Messaging = this.Messaging;
-                compileContext.CompilationId = Guid.NewGuid().ToString("N");
-                compileContext.Extensions = this.ExtensionManager.Create<ICompilerExtension>();
-                compileContext.OutputPath = sourceFile.OutputPath;
-                compileContext.Platform = Platform.X86; // TODO: set this correctly
-                compileContext.Source = document;
-
-                var compiler = new Compiler();
-                var intermediate = compiler.Compile(compileContext);
+                var preprocessor = new Preprocessor(this.ServiceProvider);
+                preprocessor.IncludeSearchPaths = this.IncludeSearchPaths;
+                preprocessor.Platform = Platform.X86; // TODO: set this correctly
+                preprocessor.SourcePath = sourceFile.SourcePath;
+                preprocessor.Variables = new Dictionary<string, string>(this.PreprocessorVariables);
+                var document = preprocessor.Execute();
+
+                var compiler = new Compiler(this.ServiceProvider);
+                compiler.OutputPath = sourceFile.OutputPath;
+                compiler.Platform = Platform.X86; // TODO: set this correctly
+                compiler.SourceDocument = document;
+                var intermediate = compiler.Execute();
 
                 intermediate.Save(sourceFile.OutputPath);
             }