aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs')
-rw-r--r--src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 041c7d5d..b0c87bcf 100644
--- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -17,14 +17,14 @@ namespace WixToolset.Core.ExtensibilityServices
17 private static readonly char[] VariableSplitter = new char[] { '.' }; 17 private static readonly char[] VariableSplitter = new char[] { '.' };
18 private static readonly char[] ArgumentSplitter = new char[] { ',' }; 18 private static readonly char[] ArgumentSplitter = new char[] { ',' };
19 19
20 public PreprocessHelper(IWixToolsetServiceProvider serviceProvider) 20 public PreprocessHelper(IServiceProvider serviceProvider)
21 { 21 {
22 this.ServiceProvider = serviceProvider; 22 this.ServiceProvider = serviceProvider;
23 23
24 this.Messaging = this.ServiceProvider.GetService<IMessaging>(); 24 this.Messaging = this.ServiceProvider.GetService<IMessaging>();
25 } 25 }
26 26
27 private IWixToolsetServiceProvider ServiceProvider { get; } 27 private IServiceProvider ServiceProvider { get; }
28 28
29 private IMessaging Messaging { get; } 29 private IMessaging Messaging { get; }
30 30
@@ -133,7 +133,7 @@ namespace WixToolset.Core.ExtensibilityServices
133 } 133 }
134 134
135 default: 135 default:
136 var extensionsByPrefix = this.GetExtensionsByPrefix(context); 136 var extensionsByPrefix = this.GetExtensionsByPrefix();
137 if (extensionsByPrefix.TryGetValue(prefix, out var extension)) 137 if (extensionsByPrefix.TryGetValue(prefix, out var extension))
138 { 138 {
139 try 139 try
@@ -259,7 +259,7 @@ namespace WixToolset.Core.ExtensibilityServices
259 return context.Variables.TryGetValue(name, out var result) ? result : null; 259 return context.Variables.TryGetValue(name, out var result) ? result : null;
260 260
261 default: 261 default:
262 var extensionsByPrefix = this.GetExtensionsByPrefix(context); 262 var extensionsByPrefix = this.GetExtensionsByPrefix();
263 if (extensionsByPrefix.TryGetValue(prefix, out var extension)) 263 if (extensionsByPrefix.TryGetValue(prefix, out var extension))
264 { 264 {
265 try 265 try
@@ -309,7 +309,7 @@ namespace WixToolset.Core.ExtensibilityServices
309 break; 309 break;
310 310
311 default: 311 default:
312 var extensionsByPrefix = this.GetExtensionsByPrefix(context); 312 var extensionsByPrefix = this.GetExtensionsByPrefix();
313 if (extensionsByPrefix.TryGetValue(prefix, out var extension)) 313 if (extensionsByPrefix.TryGetValue(prefix, out var extension))
314 { 314 {
315 if (!extension.ProcessPragma(prefix, pragma, args, parent)) 315 if (!extension.ProcessPragma(prefix, pragma, args, parent))
@@ -468,7 +468,7 @@ namespace WixToolset.Core.ExtensibilityServices
468 } 468 }
469 } 469 }
470 470
471 private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix(IPreprocessContext context) 471 private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix()
472 { 472 {
473 if (this.ExtensionsByPrefix == null) 473 if (this.ExtensionsByPrefix == null)
474 { 474 {