From 177784c9a6d93eeb3c195e6d62b97eb4c1dde32b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 2 Apr 2020 20:45:40 +1000 Subject: Use IWixToolsetServiceProvider and IWixToolsetCoreServiceProvider to expose the more convenient methods from WixToolsetServiceProvider without requiring casting or extension methods. --- src/WixToolset.Core/CommandLine/BuildCommand.cs | 8 ++++---- src/WixToolset.Core/CommandLine/CommandLine.cs | 4 ++-- src/WixToolset.Core/CommandLine/CommandLineArguments.cs | 8 ++++---- src/WixToolset.Core/CommandLine/CommandLineContext.cs | 6 +++--- src/WixToolset.Core/CommandLine/CompileCommand.cs | 6 +++--- src/WixToolset.Core/CommandLine/DecompileCommand.cs | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/WixToolset.Core/CommandLine') diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 718b3015..a59637fe 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs @@ -16,7 +16,7 @@ namespace WixToolset.Core.CommandLine { private readonly CommandLine commandLine; - public BuildCommand(IServiceProvider serviceProvider) + public BuildCommand(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); @@ -28,7 +28,7 @@ namespace WixToolset.Core.CommandLine public bool StopParsing => this.commandLine.ShowHelp; - private IServiceProvider ServiceProvider { get; } + private IWixToolsetServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; } @@ -462,13 +462,13 @@ namespace WixToolset.Core.CommandLine public string BuiltOutputsFile { get; private set; } - public CommandLine(IServiceProvider serviceProvider, IMessaging messaging) + public CommandLine(IWixToolsetServiceProvider serviceProvider, IMessaging messaging) { this.ServiceProvider = serviceProvider; this.Messaging = messaging; } - private IServiceProvider ServiceProvider { get; } + private IWixToolsetServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; } diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs index 8e359e14..683d1f5a 100644 --- a/src/WixToolset.Core/CommandLine/CommandLine.cs +++ b/src/WixToolset.Core/CommandLine/CommandLine.cs @@ -23,14 +23,14 @@ namespace WixToolset.Core.CommandLine { private static readonly char[] BindPathSplit = { '=' }; - public CommandLine(IServiceProvider serviceProvider) + public CommandLine(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = this.ServiceProvider.GetService(); } - private IServiceProvider ServiceProvider { get; } + private IWixToolsetServiceProvider ServiceProvider { get; } private IMessaging Messaging { get; set; } diff --git a/src/WixToolset.Core/CommandLine/CommandLineArguments.cs b/src/WixToolset.Core/CommandLine/CommandLineArguments.cs index 5fa547b4..3f412611 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineArguments.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineArguments.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. namespace WixToolset.Core.CommandLine { @@ -20,9 +20,9 @@ namespace WixToolset.Core.CommandLine public string ErrorArgument { get; set; } - private IServiceProvider ServiceProvider { get; } + private IWixToolsetServiceProvider ServiceProvider { get; } - public CommandLineArguments(IServiceProvider serviceProvider) + public CommandLineArguments(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; } @@ -43,7 +43,7 @@ namespace WixToolset.Core.CommandLine public ICommandLineParser Parse() { - var messaging = (IMessaging)this.ServiceProvider.GetService(typeof(IMessaging)); + var messaging = this.ServiceProvider.GetService(); return new CommandLineParser(messaging, this.Arguments, this.ErrorArgument); } diff --git a/src/WixToolset.Core/CommandLine/CommandLineContext.cs b/src/WixToolset.Core/CommandLine/CommandLineContext.cs index ea0cf3d4..6bf05590 100644 --- a/src/WixToolset.Core/CommandLine/CommandLineContext.cs +++ b/src/WixToolset.Core/CommandLine/CommandLineContext.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. namespace WixToolset.Core.CommandLine { @@ -8,12 +8,12 @@ namespace WixToolset.Core.CommandLine internal class CommandLineContext : ICommandLineContext { - public CommandLineContext(IServiceProvider serviceProvider) + public CommandLineContext(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; } - public IServiceProvider ServiceProvider { get; } + public IWixToolsetServiceProvider ServiceProvider { get; } public IExtensionManager ExtensionManager { get; set; } diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs index 0a354a8f..67756947 100644 --- a/src/WixToolset.Core/CommandLine/CompileCommand.cs +++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs @@ -12,14 +12,14 @@ namespace WixToolset.Core.CommandLine internal class CompileCommand : ICommandLineCommand { - public CompileCommand(IServiceProvider serviceProvider) + public CompileCommand(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); this.ExtensionManager = serviceProvider.GetService(); } - public CompileCommand(IServiceProvider serviceProvider, IEnumerable sources, IDictionary preprocessorVariables, Platform platform) + public CompileCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable sources, IDictionary preprocessorVariables, Platform platform) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); @@ -29,7 +29,7 @@ namespace WixToolset.Core.CommandLine this.Platform = platform; } - private IServiceProvider ServiceProvider { get; } + private IWixToolsetServiceProvider ServiceProvider { get; } public IMessaging Messaging { get; } diff --git a/src/WixToolset.Core/CommandLine/DecompileCommand.cs b/src/WixToolset.Core/CommandLine/DecompileCommand.cs index fbba3d9f..0e21a4f4 100644 --- a/src/WixToolset.Core/CommandLine/DecompileCommand.cs +++ b/src/WixToolset.Core/CommandLine/DecompileCommand.cs @@ -14,7 +14,7 @@ namespace WixToolset.Core.CommandLine { private readonly CommandLine commandLine; - public DecompileCommand(IServiceProvider serviceProvider) + public DecompileCommand(IWixToolsetServiceProvider serviceProvider) { this.ServiceProvider = serviceProvider; this.Messaging = serviceProvider.GetService(); @@ -25,7 +25,7 @@ namespace WixToolset.Core.CommandLine public bool StopParsing => this.commandLine.ShowHelp; - private IServiceProvider ServiceProvider { get; } + private IWixToolsetServiceProvider ServiceProvider { get; } public IMessaging Messaging { get; } -- cgit v1.2.3-55-g6feb