aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Preprocessor.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Preprocessor.cs')
-rw-r--r--src/WixToolset.Core/Preprocessor.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs
index aca954bd..acba0b5f 100644
--- a/src/WixToolset.Core/Preprocessor.cs
+++ b/src/WixToolset.Core/Preprocessor.cs
@@ -20,24 +20,24 @@ namespace WixToolset.Core
20 /// <summary> 20 /// <summary>
21 /// Preprocessor object 21 /// Preprocessor object
22 /// </summary> 22 /// </summary>
23 public sealed class Preprocessor 23 internal class Preprocessor
24 { 24 {
25 private readonly Regex defineRegex = new Regex(@"^\s*(?<varName>.+?)\s*(=\s*(?<varValue>.+?)\s*)?$", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture); 25 private static readonly Regex DefineRegex = new Regex(@"^\s*(?<varName>.+?)\s*(=\s*(?<varValue>.+?)\s*)?$", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture);
26 private readonly Regex pragmaRegex = new Regex(@"^\s*(?<pragmaName>.+?)(?<pragmaValue>[\s\(].+?)?$", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture); 26 private static readonly Regex PragmaRegex = new Regex(@"^\s*(?<pragmaName>.+?)(?<pragmaValue>[\s\(].+?)?$", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture);
27 27
28 private readonly XmlReaderSettings DocumentXmlReaderSettings = new XmlReaderSettings() 28 private static readonly XmlReaderSettings DocumentXmlReaderSettings = new XmlReaderSettings()
29 { 29 {
30 ValidationFlags = System.Xml.Schema.XmlSchemaValidationFlags.None, 30 ValidationFlags = System.Xml.Schema.XmlSchemaValidationFlags.None,
31 XmlResolver = null, 31 XmlResolver = null,
32 }; 32 };
33 private readonly XmlReaderSettings FragmentXmlReaderSettings = new XmlReaderSettings() 33 private static readonly XmlReaderSettings FragmentXmlReaderSettings = new XmlReaderSettings()
34 { 34 {
35 ConformanceLevel = ConformanceLevel.Fragment, 35 ConformanceLevel = ConformanceLevel.Fragment,
36 ValidationFlags = System.Xml.Schema.XmlSchemaValidationFlags.None, 36 ValidationFlags = System.Xml.Schema.XmlSchemaValidationFlags.None,
37 XmlResolver = null, 37 XmlResolver = null,
38 }; 38 };
39 39
40 public Preprocessor(IServiceProvider serviceProvider) 40 internal Preprocessor(IServiceProvider serviceProvider)
41 { 41 {
42 this.ServiceProvider = serviceProvider; 42 this.ServiceProvider = serviceProvider;
43 43
@@ -584,7 +584,7 @@ namespace WixToolset.Core
584 /// <param name="originalDefine">Text from source.</param> 584 /// <param name="originalDefine">Text from source.</param>
585 private void PreprocessDefine(string originalDefine) 585 private void PreprocessDefine(string originalDefine)
586 { 586 {
587 var match = defineRegex.Match(originalDefine); 587 var match = DefineRegex.Match(originalDefine);
588 588
589 if (!match.Success) 589 if (!match.Success)
590 { 590 {
@@ -791,7 +791,7 @@ namespace WixToolset.Core
791 /// <param name="pragmaText">Text from source.</param> 791 /// <param name="pragmaText">Text from source.</param>
792 private void PreprocessPragma(string pragmaText, XContainer parent) 792 private void PreprocessPragma(string pragmaText, XContainer parent)
793 { 793 {
794 var match = pragmaRegex.Match(pragmaText); 794 var match = PragmaRegex.Match(pragmaText);
795 795
796 if (!match.Success) 796 if (!match.Success)
797 { 797 {