From 615bc202834ac45a9a107e5fccd900081a4abf74 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 1 Mar 2019 16:45:55 -0800 Subject: Include the preprocessed include files with the processed document This change also cleans up the internal state handling of the preprocesor to pass the processing state around rather than depend on "global state" in member variables. This removes the need to "reset" the member variables before preprocessing which is much cleaner. --- src/WixToolset.Core/WixToolsetServiceProvider.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/WixToolset.Core/WixToolsetServiceProvider.cs') diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs index e03be0b2..267e4524 100644 --- a/src/WixToolset.Core/WixToolsetServiceProvider.cs +++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs @@ -45,6 +45,8 @@ namespace WixToolset.Core this.AddService((provider, singletons) => new BindResult()); this.AddService((provider, singletons) => new ComponentKeyPath()); this.AddService((provider, singletons) => new DecompileResult()); + this.AddService((provider, singletons) => new IncludedFile()); + this.AddService((provider, singletons) => new PreprocessResult()); this.AddService((provider, singletons) => new ResolveFileResult()); this.AddService((provider, singletons) => new ResolveResult()); this.AddService((provider, singletons) => new ResolvedCabinet()); -- cgit v1.2.3-55-g6feb