Update to fixed "binder" names in interfaces
Rob Mensching committed
Oct 24, 2018 at 21:06 UTC
7a2859709034f7f4f048a0757779a6e2fee6df5b
8 files changed
+11
-11
src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+2
-2
@@ -22,7 +22,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
22
// As outlined in RFC 4122, this is our namespace for generating name-based (version 3) UUIDs.
23
internal static readonly Guid WixComponentGuidNamespace = new Guid("{3064E5C6-FB63-4FE9-AC49-E446A792EFA5}");
24
25
- public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendExtension> backendExtension, Validator validator)
25
+ public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtension, Validator validator)
26
{
27
this.Messaging = context.ServiceProvider.GetService<IMessaging>();
28
@@ -66,7 +66,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
66
67
public bool DeltaBinaryPatch { get; set; }
68
69
- private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
69
+ private IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { get; }
70
71
private Intermediate Intermediate { get; }
72
src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
+2
-2
@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
14
15
public class CabinetResolver
16
{
17
- public CabinetResolver(string cabCachePath, IEnumerable<IWindowsInstallerBackendExtension> backendExtensions)
17
+ public CabinetResolver(string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
18
{
19
this.CabCachePath = cabCachePath;
20
@@ -23,7 +23,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
23
24
private string CabCachePath { get; }
25
26
- private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
26
+ private IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { get; }
27
28
public ResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<FileFacade> fileFacades)
29
{
src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+1
-1
@@ -64,7 +64,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
64
/// </summary>
65
public CompressionLevel? DefaultCompressionLevel { private get; set; }
66
67
- public IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { private get; set; }
67
+ public IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { private get; set; }
68
69
public Output Output { private get; set; }
70
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+2
-2
@@ -14,14 +14,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
14
15
internal class CreateOutputFromIRCommand
16
{
17
- public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendExtension> backendExtensions)
17
+ public CreateOutputFromIRCommand(IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
18
{
19
this.Section = section;
20
this.TableDefinitions = tableDefinitions;
21
this.BackendExtensions = backendExtensions;
22
}
23
24
- private IEnumerable<IWindowsInstallerBackendExtension> BackendExtensions { get; }
24
+ private IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { get; }
25
26
private TableDefinitionCollection TableDefinitions { get; }
27
src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+1
-1
@@ -17,7 +17,7 @@ namespace WixToolset.Core.WindowsInstaller
17
{
18
var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();
19
20
- var backendExtensions = extensionManager.Create<IWindowsInstallerBackendExtension>();
20
+ var backendExtensions = extensionManager.Create<IWindowsInstallerBackendBinderExtension>();
21
22
foreach (var extension in backendExtensions)
23
{
src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+1
-1
@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller
16
{
17
var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();
18
19
- var backendExtensions = extensionManager.Create<IWindowsInstallerBackendExtension>();
19
+ var backendExtensions = extensionManager.Create<IWindowsInstallerBackendBinderExtension>();
20
21
foreach (var extension in backendExtensions)
22
{
src/WixToolset.Core/WixToolsetServiceProvider.cs
+1
-1
@@ -18,7 +18,7 @@ namespace WixToolset.Core
18
this.Singletons = new Dictionary<Type, object>();
19
20
// Singletons.
21
- this.AddService((provider, singletons) => AddSingleton<IExtensionManager>(singletons, new ExtensionManager()));
21
+ this.AddService((provider, singletons) => AddSingleton<IExtensionManager>(singletons, new ExtensionManager(provider)));
22
this.AddService((provider, singletons) => AddSingleton<IMessaging>(singletons, new Messaging()));
23
this.AddService((provider, singletons) => AddSingleton<ITupleDefinitionCreator>(singletons, new TupleDefinitionCreator(provider)));
24
this.AddService((provider, singletons) => AddSingleton<IParseHelper>(singletons, new ParseHelper(provider)));
src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
+1
-1
@@ -6,7 +6,7 @@ namespace Example.Extension
6
using WixToolset.Data.WindowsInstaller;
7
using WixToolset.Extensibility;
8
9
- internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendExtension
9
+ internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendBinderExtension
10
{
11
public override bool TryAddTupleToOutput(IntermediateTuple tuple, Output output)
12
{