From e8ebab2ce3991c3abb9942ce48a026a2169df01e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 14 Mar 2021 11:20:54 -0700 Subject: Remove use of removed IWixToolsetServiceProvider --- .../ExtensibilityServices/PreprocessHelper.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs') 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 private static readonly char[] VariableSplitter = new char[] { '.' }; private static readonly char[] ArgumentSplitter = new char[] { ',' }; - public PreprocessHelper(IWixToolsetServiceProvider serviceProvider) + public PreprocessHelper(IServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = this.ServiceProvider.GetService(); } - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; } @@ -133,7 +133,7 @@ namespace WixToolset.Core.ExtensibilityServices } default: - var extensionsByPrefix = this.GetExtensionsByPrefix(context); + var extensionsByPrefix = this.GetExtensionsByPrefix(); if (extensionsByPrefix.TryGetValue(prefix, out var extension)) { try @@ -259,7 +259,7 @@ namespace WixToolset.Core.ExtensibilityServices return context.Variables.TryGetValue(name, out var result) ? result : null; default: - var extensionsByPrefix = this.GetExtensionsByPrefix(context); + var extensionsByPrefix = this.GetExtensionsByPrefix(); if (extensionsByPrefix.TryGetValue(prefix, out var extension)) { try @@ -309,7 +309,7 @@ namespace WixToolset.Core.ExtensibilityServices break; default: - var extensionsByPrefix = this.GetExtensionsByPrefix(context); + var extensionsByPrefix = this.GetExtensionsByPrefix(); if (extensionsByPrefix.TryGetValue(prefix, out var extension)) { if (!extension.ProcessPragma(prefix, pragma, args, parent)) @@ -468,7 +468,7 @@ namespace WixToolset.Core.ExtensibilityServices } } - private Dictionary GetExtensionsByPrefix(IPreprocessContext context) + private Dictionary GetExtensionsByPrefix() { if (this.ExtensionsByPrefix == null) { -- cgit v1.2.3-55-g6feb