Address breaking changes.
Sean Hall committed
Apr 2, 2020 at 21:20 UTC
56ab717c8e1dc4c30b4350a384e2d98982983bb3
6 files changed
+15
-14
src/WixToolset.BuildTasks/DoIt.cs
+3
-3
@@ -111,7 +111,7 @@ namespace WixToolset.BuildTasks
111
112
public override bool Execute()
113
{
114
- var serviceProvider = new WixToolsetServiceProvider();
114
+ var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
115
116
var listener = new MsbuildMessageListener(this.Log, "WIX", this.BuildEngine.ProjectFileOfTaskNode);
117
@@ -136,7 +136,7 @@ namespace WixToolset.BuildTasks
136
return !this.Log.HasLoggedErrors;
137
}
138
139
- private void ExecuteCore(IServiceProvider serviceProvider, IMessageListener listener)
139
+ private void ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener)
140
{
141
var commandLineString = this.BuildCommandLine();
142
@@ -191,7 +191,7 @@ namespace WixToolset.BuildTasks
191
return commandLineBuilder.ToString();
192
}
193
194
- private IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider, IMessaging messaging, string[] extensions)
194
+ private IExtensionManager CreateExtensionManagerWithStandardBackends(IWixToolsetServiceProvider serviceProvider, IMessaging messaging, string[] extensions)
195
{
196
var extensionManager = serviceProvider.GetService<IExtensionManager>();
197
src/test/WixToolsetTest.WixCop/WixCopRunner.cs
+3
-2
@@ -7,6 +7,7 @@ namespace WixToolsetTest.WixCop
7
using WixToolset.Core;
8
using WixToolset.Core.TestPackage;
9
using WixToolset.Extensibility;
10
+ using WixToolset.Extensibility.Services;
11
using WixToolset.Tools.WixCop;
12
using WixToolset.Tools.WixCop.CommandLine;
13
using WixToolset.Tools.WixCop.Interfaces;
@@ -45,7 +46,7 @@ namespace WixToolsetTest.WixCop
46
{
47
var listener = new TestMessageListener();
48
48
- var serviceProvider = new WixToolsetServiceProvider();
49
+ var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
50
serviceProvider.AddService<IMessageListener>((x, y) => listener);
51
serviceProvider.AddService<IWixCopCommandLineParser>((x, y) => new WixCopCommandLineParser(x));
52
@@ -58,7 +59,7 @@ namespace WixToolsetTest.WixCop
59
};
60
}
61
61
- public static int Execute(IServiceProvider serviceProvider, string[] args)
62
+ public static int Execute(IWixToolsetServiceProvider serviceProvider, string[] args)
63
{
64
var wixcop = new Program();
65
return wixcop.Run(serviceProvider, args);
src/wix/Program.cs
+3
-3
@@ -24,7 +24,7 @@ namespace WixToolset.Tools
24
[MTAThread]
25
public static int Main(string[] args)
26
{
27
- var serviceProvider = new WixToolsetServiceProvider();
27
+ var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
28
29
var listener = new ConsoleMessageListener("WIX", "wix.exe");
30
@@ -58,7 +58,7 @@ namespace WixToolset.Tools
58
/// <param name="serviceProvider">Service provider to use throughout this execution.</param>
59
/// <param name="args">Command-line arguments to execute.</param>
60
/// <returns>Returns the application error code.</returns>
61
- public int Run(IServiceProvider serviceProvider, IMessageListener listener, string[] args)
61
+ public int Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args)
62
{
63
var messaging = serviceProvider.GetService<IMessaging>();
64
messaging.SetListener(listener);
@@ -73,7 +73,7 @@ namespace WixToolset.Tools
73
return command?.Execute() ?? 1;
74
}
75
76
- private static IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider, IMessaging messaging, string[] extensions)
76
+ private static IExtensionManager CreateExtensionManagerWithStandardBackends(IWixToolsetServiceProvider serviceProvider, IMessaging messaging, string[] extensions)
77
{
78
var extensionManager = serviceProvider.GetService<IExtensionManager>();
79
src/wixcop/CommandLine/ConvertCommand.cs
+2
-2
@@ -14,7 +14,7 @@ namespace WixToolset.Tools.WixCop.CommandLine
14
{
15
private const string SettingsFileDefault = "wixcop.settings.xml";
16
17
- public ConvertCommand(IServiceProvider serviceProvider, bool fixErrors, int indentationAmount, List<string> searchPatterns, bool subDirectories, string settingsFile1, string settingsFile2)
17
+ public ConvertCommand(IWixToolsetServiceProvider serviceProvider, bool fixErrors, int indentationAmount, List<string> searchPatterns, bool subDirectories, string settingsFile1, string settingsFile2)
18
{
19
this.ErrorsAsWarnings = new HashSet<string>();
20
this.ExemptFiles = new HashSet<string>();
@@ -43,7 +43,7 @@ namespace WixToolset.Tools.WixCop.CommandLine
43
44
private List<string> SearchPatterns { get; }
45
46
- private IServiceProvider ServiceProvider { get; }
46
+ private IWixToolsetServiceProvider ServiceProvider { get; }
47
48
private string SettingsFile1 { get; }
49
src/wixcop/CommandLine/WixCopCommandLineParser.cs
+2
-2
@@ -14,14 +14,14 @@ namespace WixToolset.Tools.WixCop.CommandLine
14
private bool fixErrors;
15
private int indentationAmount;
16
private readonly List<string> searchPatterns;
17
- private readonly IServiceProvider serviceProvider;
17
+ private readonly IWixToolsetServiceProvider serviceProvider;
18
private string settingsFile1;
19
private string settingsFile2;
20
private bool showHelp;
21
private bool showLogo;
22
private bool subDirectories;
23
24
- public WixCopCommandLineParser(IServiceProvider serviceProvider)
24
+ public WixCopCommandLineParser(IWixToolsetServiceProvider serviceProvider)
25
{
26
this.serviceProvider = serviceProvider;
27
src/wixcop/Program.cs
+2
-2
@@ -24,7 +24,7 @@ namespace WixToolset.Tools.WixCop
24
[STAThread]
25
public static int Main(string[] args)
26
{
27
- var serviceProvider = new WixToolsetServiceProvider();
27
+ var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider();
28
var listener = new ConsoleMessageListener("WXCP", "wixcop.exe");
29
30
serviceProvider.AddService<IMessageListener>((x, y) => listener);
@@ -40,7 +40,7 @@ namespace WixToolset.Tools.WixCop
40
/// <param name="serviceProvider">Service provider to use throughout this execution.</param>
41
/// <param name="args">The commandline arguments.</param>
42
/// <returns>The number of errors that were found.</returns>
43
- public int Run(IServiceProvider serviceProvider, string[] args)
43
+ public int Run(IWixToolsetServiceProvider serviceProvider, string[] args)
44
{
45
try
46
{