diff options
author | Rob Mensching <rob@firegiant.com> | 2017-10-17 02:47:44 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-10-18 13:31:55 -0700 |
commit | c08fd0aefeea1628fe93c818ca4dde63fd6ac2e1 (patch) | |
tree | ac63402f6bad7f3a5bc20b088914145d9bf8635b /src/WixToolset.Core.WindowsInstaller | |
parent | 6dd045318f7ee405e92e76d311ad1424c20157c1 (diff) | |
download | wix-c08fd0aefeea1628fe93c818ca4dde63fd6ac2e1.tar.gz wix-c08fd0aefeea1628fe93c818ca4dde63fd6ac2e1.tar.bz2 wix-c08fd0aefeea1628fe93c818ca4dde63fd6ac2e1.zip |
Introduce WixToolsetServiceProvider
Using a service provider allows all of WixToolset.Core's internal
functionality to be abstracted behind interfaces in WixToolset.Extensibility.
The service provide can also control what interfaces are singletons.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller')
8 files changed, 19 insertions, 0 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 2e2c5417..21fbb022 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
@@ -16,6 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
16 | using WixToolset.Data.Bind; | 16 | using WixToolset.Data.Bind; |
17 | using WixToolset.Data.Rows; | 17 | using WixToolset.Data.Rows; |
18 | using WixToolset.Extensibility; | 18 | using WixToolset.Extensibility; |
19 | using WixToolset.Extensibility.Services; | ||
19 | using WixToolset.Msi; | 20 | using WixToolset.Msi; |
20 | 21 | ||
21 | /// <summary> | 22 | /// <summary> |
diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs index 716ea000..bf7b4579 100644 --- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs | |||
@@ -8,6 +8,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
9 | using WixToolset.Data.Bind; | 9 | using WixToolset.Data.Bind; |
10 | using WixToolset.Extensibility; | 10 | using WixToolset.Extensibility; |
11 | using WixToolset.Extensibility.Services; | ||
11 | 12 | ||
12 | internal class MsiBackend : IBackend | 13 | internal class MsiBackend : IBackend |
13 | { | 14 | { |
diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs index 268213d7..69d7ada0 100644 --- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs | |||
@@ -7,6 +7,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
8 | using WixToolset.Data.Bind; | 8 | using WixToolset.Data.Bind; |
9 | using WixToolset.Extensibility; | 9 | using WixToolset.Extensibility; |
10 | using WixToolset.Extensibility.Services; | ||
10 | 11 | ||
11 | internal class MsmBackend : IBackend | 12 | internal class MsmBackend : IBackend |
12 | { | 13 | { |
diff --git a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs index 4b13258b..ea16a570 100644 --- a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs | |||
@@ -10,6 +10,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
11 | using WixToolset.Data.Bind; | 11 | using WixToolset.Data.Bind; |
12 | using WixToolset.Extensibility; | 12 | using WixToolset.Extensibility; |
13 | using WixToolset.Extensibility.Services; | ||
13 | using WixToolset.Msi; | 14 | using WixToolset.Msi; |
14 | using WixToolset.Ole32; | 15 | using WixToolset.Ole32; |
15 | 16 | ||
diff --git a/src/WixToolset.Core.WindowsInstaller/MstBackend.cs b/src/WixToolset.Core.WindowsInstaller/MstBackend.cs index 2cb7da89..66bc57ae 100644 --- a/src/WixToolset.Core.WindowsInstaller/MstBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MstBackend.cs | |||
@@ -8,6 +8,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
9 | using WixToolset.Data.Bind; | 9 | using WixToolset.Data.Bind; |
10 | using WixToolset.Extensibility; | 10 | using WixToolset.Extensibility; |
11 | using WixToolset.Extensibility.Services; | ||
11 | 12 | ||
12 | internal class MstBackend : IBackend | 13 | internal class MstBackend : IBackend |
13 | { | 14 | { |
diff --git a/src/WixToolset.Core.WindowsInstaller/StandardBackend.cs b/src/WixToolset.Core.WindowsInstaller/StandardBackend.cs new file mode 100644 index 00000000..f1ae2017 --- /dev/null +++ b/src/WixToolset.Core.WindowsInstaller/StandardBackend.cs | |||
@@ -0,0 +1,12 @@ | |||
1 | // 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. | ||
2 | |||
3 | namespace WixToolset.Core.WindowsInstaller | ||
4 | { | ||
5 | /// <summary> | ||
6 | /// Denotes this assembly contains a backend that is considered | ||
7 | /// a standard part of the WiX Toolset. | ||
8 | /// </summary> | ||
9 | public static class StandardBackend | ||
10 | { | ||
11 | } | ||
12 | } | ||
diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs index db66f600..652a8a07 100644 --- a/src/WixToolset.Core.WindowsInstaller/Validator.cs +++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs | |||
@@ -16,6 +16,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
16 | using WixToolset.Msi; | 16 | using WixToolset.Msi; |
17 | using System.Linq; | 17 | using System.Linq; |
18 | using System.Reflection; | 18 | using System.Reflection; |
19 | using WixToolset.Extensibility.Services; | ||
19 | 20 | ||
20 | /// <summary> | 21 | /// <summary> |
21 | /// Runs internal consistency evaluators (ICEs) from cub files against a database. | 22 | /// Runs internal consistency evaluators (ICEs) from cub files against a database. |
diff --git a/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs index b66a4617..a7f58ed4 100644 --- a/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs +++ b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs | |||
@@ -5,6 +5,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
5 | using System; | 5 | using System; |
6 | using System.IO; | 6 | using System.IO; |
7 | using WixToolset.Extensibility; | 7 | using WixToolset.Extensibility; |
8 | using WixToolset.Extensibility.Services; | ||
8 | 9 | ||
9 | internal class WindowsInstallerBackendFactory : IBackendFactory | 10 | internal class WindowsInstallerBackendFactory : IBackendFactory |
10 | { | 11 | { |