aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@joyofsetup.com>2018-08-23 20:13:12 -0400
committerBob Arnson <bob@joyofsetup.com>2018-08-23 20:13:12 -0400
commite5674bda26dff606c4961e4dc26c6fb19e925a5c (patch)
tree7bc2ae2608e1428cd4f6dc3132fac5fa5330148d
parent377cf89824f11150c3caa41adb09fb2f6f3df633 (diff)
downloadwix-e5674bda26dff606c4961e4dc26c6fb19e925a5c.tar.gz
wix-e5674bda26dff606c4961e4dc26c6fb19e925a5c.tar.bz2
wix-e5674bda26dff606c4961e4dc26c6fb19e925a5c.zip
Add WixRunner that takes a service provider.
-rw-r--r--src/WixToolset.Core.TestPackage/WixRunner.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/WixToolset.Core.TestPackage/WixRunner.cs b/src/WixToolset.Core.TestPackage/WixRunner.cs
index 62502ecc..1c77a7ee 100644
--- a/src/WixToolset.Core.TestPackage/WixRunner.cs
+++ b/src/WixToolset.Core.TestPackage/WixRunner.cs
@@ -13,12 +13,16 @@ namespace WixToolset.Core.TestPackage
13 { 13 {
14 public static int Execute(string[] args, out List<Message> messages) 14 public static int Execute(string[] args, out List<Message> messages)
15 { 15 {
16 var serviceProvider = new WixToolsetServiceProvider();
17 return Execute(args, serviceProvider, out messages);
18 }
19
20 public static int Execute(string[] args, IServiceProvider serviceProvider, out List<Message> messages)
21 {
16 var listener = new TestListener(); 22 var listener = new TestListener();
17 23
18 messages = listener.Messages; 24 messages = listener.Messages;
19 25
20 var serviceProvider = new WixToolsetServiceProvider();
21
22 var messaging = serviceProvider.GetService<IMessaging>(); 26 var messaging = serviceProvider.GetService<IMessaging>();
23 messaging.SetListener(listener); 27 messaging.SetListener(listener);
24 28