diff options
author | Bob Arnson <bob@firegiant.com> | 2021-03-15 20:46:45 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2021-03-15 20:53:12 -0400 |
commit | 6ffe147d054e6515b5276f6412994fe88392366b (patch) | |
tree | 29e22af7540c6e0c9c0e2a5566beaff08c7dc151 | |
parent | d1050931018d6e8dd06189202492df666dfbb594 (diff) | |
download | wix-6ffe147d054e6515b5276f6412994fe88392366b.tar.gz wix-6ffe147d054e6515b5276f6412994fe88392366b.tar.bz2 wix-6ffe147d054e6515b5276f6412994fe88392366b.zip |
Update service provider dependency
4 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.Converters/ConvertCommand.cs b/src/WixToolset.Converters/ConvertCommand.cs index e29b176e..b6826f43 100644 --- a/src/WixToolset.Converters/ConvertCommand.cs +++ b/src/WixToolset.Converters/ConvertCommand.cs | |||
@@ -11,7 +11,7 @@ namespace WixToolset.Converters | |||
11 | { | 11 | { |
12 | private const string SettingsFileDefault = "wix.convert.settings.xml"; | 12 | private const string SettingsFileDefault = "wix.convert.settings.xml"; |
13 | 13 | ||
14 | public ConvertCommand(IWixToolsetServiceProvider serviceProvider) | 14 | public ConvertCommand(IServiceProvider serviceProvider) |
15 | { | 15 | { |
16 | this.Messaging = serviceProvider.GetService<IMessaging>(); | 16 | this.Messaging = serviceProvider.GetService<IMessaging>(); |
17 | } | 17 | } |
diff --git a/src/WixToolset.Converters/ConverterExtensionCommandLine.cs b/src/WixToolset.Converters/ConverterExtensionCommandLine.cs index d78b89cc..8d740a3a 100644 --- a/src/WixToolset.Converters/ConverterExtensionCommandLine.cs +++ b/src/WixToolset.Converters/ConverterExtensionCommandLine.cs | |||
@@ -14,12 +14,12 @@ namespace WixToolset.Converters | |||
14 | /// </summary> | 14 | /// </summary> |
15 | internal class ConverterExtensionCommandLine : BaseExtensionCommandLine | 15 | internal class ConverterExtensionCommandLine : BaseExtensionCommandLine |
16 | { | 16 | { |
17 | public ConverterExtensionCommandLine(IWixToolsetServiceProvider serviceProvider) | 17 | public ConverterExtensionCommandLine(IServiceProvider serviceProvider) |
18 | { | 18 | { |
19 | this.ServiceProvider = serviceProvider; | 19 | this.ServiceProvider = serviceProvider; |
20 | } | 20 | } |
21 | 21 | ||
22 | private IWixToolsetServiceProvider ServiceProvider { get; } | 22 | private IServiceProvider ServiceProvider { get; } |
23 | 23 | ||
24 | public override IEnumerable<ExtensionCommandLineSwitch> CommandLineSwitches => new ExtensionCommandLineSwitch[] | 24 | public override IEnumerable<ExtensionCommandLineSwitch> CommandLineSwitches => new ExtensionCommandLineSwitch[] |
25 | { | 25 | { |
diff --git a/src/WixToolset.Converters/ConverterExtensionFactory.cs b/src/WixToolset.Converters/ConverterExtensionFactory.cs index 51099e67..d4f480aa 100644 --- a/src/WixToolset.Converters/ConverterExtensionFactory.cs +++ b/src/WixToolset.Converters/ConverterExtensionFactory.cs | |||
@@ -8,12 +8,12 @@ namespace WixToolset.Converters | |||
8 | 8 | ||
9 | internal class ConverterExtensionFactory : IExtensionFactory | 9 | internal class ConverterExtensionFactory : IExtensionFactory |
10 | { | 10 | { |
11 | public ConverterExtensionFactory(IWixToolsetServiceProvider serviceProvider) | 11 | public ConverterExtensionFactory(IServiceProvider serviceProvider) |
12 | { | 12 | { |
13 | this.ServiceProvider = serviceProvider; | 13 | this.ServiceProvider = serviceProvider; |
14 | } | 14 | } |
15 | 15 | ||
16 | private IWixToolsetServiceProvider ServiceProvider { get; } | 16 | private IServiceProvider ServiceProvider { get; } |
17 | 17 | ||
18 | public bool TryCreateExtension(Type extensionType, out object extension) | 18 | public bool TryCreateExtension(Type extensionType, out object extension) |
19 | { | 19 | { |
diff --git a/src/WixToolset.Converters/FormatCommand.cs b/src/WixToolset.Converters/FormatCommand.cs index e9965df3..0861fc51 100644 --- a/src/WixToolset.Converters/FormatCommand.cs +++ b/src/WixToolset.Converters/FormatCommand.cs | |||
@@ -11,7 +11,7 @@ namespace WixToolset.Converters | |||
11 | { | 11 | { |
12 | private const string SettingsFileDefault = "wix.format.settings.xml"; | 12 | private const string SettingsFileDefault = "wix.format.settings.xml"; |
13 | 13 | ||
14 | public FormatCommand(IWixToolsetServiceProvider serviceProvider) | 14 | public FormatCommand(IServiceProvider serviceProvider) |
15 | { | 15 | { |
16 | this.Messaging = serviceProvider.GetService<IMessaging>(); | 16 | this.Messaging = serviceProvider.GetService<IMessaging>(); |
17 | } | 17 | } |