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 --- src/WixToolset.Core/CommandLine/BuildCommand.cs | 8 ++++---- src/WixToolset.Core/CommandLine/CommandLine.cs | 4 ++-- src/WixToolset.Core/CommandLine/CommandLineArguments.cs | 2 +- src/WixToolset.Core/CommandLine/CommandLineContext.cs | 4 ++-- src/WixToolset.Core/CommandLine/CompileCommand.cs | 6 +++--- src/WixToolset.Core/CommandLine/DecompileCommand.cs | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/WixToolset.Core/CommandLine') diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index b687e07b..baca91ba 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs @@ -18,7 +18,7 @@ namespace WixToolset.Core.CommandLine { private readonly CommandLine commandLine; - public BuildCommand(IWixToolsetServiceProvider serviceProvider) + public BuildCommand(IServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); @@ -30,7 +30,7 @@ namespace WixToolset.Core.CommandLine public bool StopParsing => this.commandLine.ShowHelp; - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; } @@ -541,13 +541,13 @@ namespace WixToolset.Core.CommandLine public string BuiltOutputsFile { get; private set; } - public CommandLine(IWixToolsetServiceProvider serviceProvider, IMessaging messaging) + public CommandLine(IServiceProvider serviceProvider, IMessaging messaging) { this.ServiceProvider = serviceProvider; this.Messaging = messaging; } - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; } diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs index 7371628b..b87b6a5d 100644 --- a/src/WixToolset.Core/CommandLine/CommandLine.cs +++ b/src/WixToolset.Core/CommandLine/CommandLine.cs @@ -21,9 +21,9 @@ namespace WixToolset.Core.CommandLine internal class CommandLine : ICommandLine { - public CommandLine(IWixToolsetServiceProvider serviceProvider) => this.ServiceProvider = serviceProvider; + public CommandLine(IServiceProvider serviceProvider) => this.ServiceProvider = serviceProvider; - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } public ICommandLineCommand CreateCommand(string[] args) { diff --git a/src/WixToolset.Core/CommandLine/CommandLineArguments.cs b/src/WixToolset.Core/CommandLine/CommandLineArguments.cs index 456e19d7..40b8b320 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineArguments.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineArguments.cs @@ -12,7 +12,7 @@ namespace WixToolset.Core.CommandLine internal class CommandLineArguments : ICommandLineArguments { - public CommandLineArguments(IWixToolsetServiceProvider serviceProvider) + public CommandLineArguments(IServiceProvider serviceProvider) { this.Messaging = serviceProvider.GetService(); } diff --git a/src/WixToolset.Core/CommandLine/CommandLineContext.cs b/src/WixToolset.Core/CommandLine/CommandLineContext.cs index 6bf05590..8d5cf120 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineContext.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineContext.cs @@ -8,12 +8,12 @@ namespace WixToolset.Core.CommandLine internal class CommandLineContext : ICommandLineContext { - public CommandLineContext(IWixToolsetServiceProvider serviceProvider) + public CommandLineContext(IServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; } - public IWixToolsetServiceProvider ServiceProvider { get; } + public IServiceProvider ServiceProvider { get; } public IExtensionManager ExtensionManager { get; set; } diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs index f6f9c623..54d1b6f1 100644 --- a/src/WixToolset.Core/CommandLine/CompileCommand.cs +++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs @@ -13,14 +13,14 @@ namespace WixToolset.Core.CommandLine internal class CompileCommand : ICommandLineCommand { - public CompileCommand(IWixToolsetServiceProvider serviceProvider) + public CompileCommand(IServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); this.ExtensionManager = serviceProvider.GetService(); } - public CompileCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable sources, IDictionary preprocessorVariables, Platform platform) + public CompileCommand(IServiceProvider serviceProvider, IEnumerable sources, IDictionary preprocessorVariables, Platform platform) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); @@ -30,7 +30,7 @@ namespace WixToolset.Core.CommandLine this.Platform = platform; } - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } public IMessaging Messaging { get; } diff --git a/src/WixToolset.Core/CommandLine/DecompileCommand.cs b/src/WixToolset.Core/CommandLine/DecompileCommand.cs index 53d0c309..fc0ab0c9 100644 --- a/src/WixToolset.Core/CommandLine/DecompileCommand.cs +++ b/src/WixToolset.Core/CommandLine/DecompileCommand.cs @@ -16,7 +16,7 @@ namespace WixToolset.Core.CommandLine { private readonly CommandLine commandLine; - public DecompileCommand(IWixToolsetServiceProvider serviceProvider) + public DecompileCommand(IServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); @@ -27,7 +27,7 @@ namespace WixToolset.Core.CommandLine public bool StopParsing => this.commandLine.ShowHelp; - private IWixToolsetServiceProvider ServiceProvider { get; } + private IServiceProvider ServiceProvider { get; } public IMessaging Messaging { get; } -- cgit v1.2.3-55-g6feb