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.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/WixToolset.Core/IPreprocessor.cs b/src/WixToolset.Core/IPreprocessor.cs
index d892399c..151f8111 100644
--- a/src/WixToolset.Core/IPreprocessor.cs
+++ b/src/WixToolset.Core/IPreprocessor.cs
@@ -3,13 +3,12 @@
 namespace WixToolset.Core
 {
     using System.Xml;
-    using System.Xml.Linq;
     using WixToolset.Extensibility.Data;
 
     public interface IPreprocessor
     {
-        XDocument Preprocess(IPreprocessContext context);
+        IPreprocessResult Preprocess(IPreprocessContext context);
 
-        XDocument Preprocess(IPreprocessContext context, XmlReader reader);
+        IPreprocessResult Preprocess(IPreprocessContext context, XmlReader reader);
     }
 }