From 2bb37beda887d120a0ddabf874ad25357101faa1 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 1 Nov 2017 10:59:45 -0700 Subject: Update to WiX Intermediate Representation --- src/WixToolset.Core/Preprocessor.cs | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'src/WixToolset.Core/Preprocessor.cs') diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs index a9fbcbb7..85b3dab8 100644 --- a/src/WixToolset.Core/Preprocessor.cs +++ b/src/WixToolset.Core/Preprocessor.cs @@ -38,7 +38,6 @@ namespace WixToolset private List extensions; private Dictionary extensionsByPrefix; - private List inspectorExtensions; private SourceLineNumber currentLineNumber; private Stack sourceStack; @@ -60,7 +59,6 @@ namespace WixToolset this.extensions = new List(); this.extensionsByPrefix = new Dictionary(); - this.inspectorExtensions = new List(); this.sourceStack = new Stack(); @@ -201,27 +199,9 @@ namespace WixToolset public XDocument Process(string sourceFile, IDictionary variables) { using (Stream sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (XmlReader reader = XmlReader.Create(sourceFile, DocumentXmlReaderSettings)) { - InspectorCore inspectorCore = new InspectorCore(); - foreach (InspectorExtension inspectorExtension in this.inspectorExtensions) - { - inspectorExtension.Core = inspectorCore; - inspectorExtension.InspectSource(sourceStream); - - // reset - inspectorExtension.Core = null; - sourceStream.Position = 0; - } - - if (inspectorCore.EncounteredError) - { - return null; - } - - using (XmlReader reader = XmlReader.Create(sourceFile, DocumentXmlReaderSettings)) - { - return Process(reader, variables, sourceFile); - } + return Process(reader, variables, sourceFile); } } -- cgit v1.2.3-55-g6feb