Remove references to Core from backends.
#6340
Sean Hall committed
Mar 14, 2021 at 11:27 UTC
dad79129d26cfb12f0d8894d9189334fa982b823
9 files changed
+6
-12
src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
-1
@@ -8,7 +8,6 @@ namespace WixToolset.Core.Burn
8
using System.Globalization;
9
using System.IO;
10
using System.Linq;
11
- using WixToolset.Core.Bind;
11
using WixToolset.Core.Burn.Bind;
12
using WixToolset.Core.Burn.Bundles;
13
using WixToolset.Core.Burn.Interfaces;
src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+2
-4
@@ -21,16 +21,14 @@
21
</AssemblyAttribute>
22
</ItemGroup>
23
24
- <ItemGroup>
25
- <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
26
- </ItemGroup>
27
-
24
<ItemGroup>
25
<PackageReference Include="System.Security.Permissions" Version="4.6.0" />
26
<PackageReference Include="WixToolset.Burn" Version="4.0.*" />
27
<PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
28
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" />
29
<PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" />
30
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
31
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
32
</ItemGroup>
33
34
<ItemGroup>
src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
-1
@@ -8,7 +8,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
8
using System.IO;
9
using System.Linq;
10
using System.Runtime.InteropServices;
11
- using WixToolset.Core.Bind;
11
using WixToolset.Data;
12
using WixToolset.Data.Symbols;
13
using WixToolset.Data.WindowsInstaller;
src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs
-1
@@ -6,7 +6,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
6
using System.Collections.Generic;
7
using System.Globalization;
8
using System.IO;
9
- using WixToolset.Core.Bind;
9
using WixToolset.Data;
10
using WixToolset.Data.Symbols;
11
using WixToolset.Extensibility.Data;
src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+2
-4
@@ -12,13 +12,11 @@
12
<CreateDocumentationFile>true</CreateDocumentationFile>
13
</PropertyGroup>
14
15
- <ItemGroup>
16
- <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
17
- </ItemGroup>
18
-
15
<ItemGroup>
16
<PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
17
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" />
18
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
19
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
20
</ItemGroup>
21
22
<ItemGroup>
src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
-1
@@ -31,7 +31,6 @@ namespace WixToolset.Core.WindowsInstaller
31
{
32
// Singletons.
33
coreProvider.AddService((provider, singletons) => AddSingleton<IWindowsInstallerBackendHelper>(singletons, new WindowsInstallerBackendHelper(provider)));
34
- coreProvider.AddService<IUnbinder>((provider, singletons) => new Unbinder(provider));
34
}
35
36
private static T AddSingleton<T>(Dictionary<Type, object> singletons, T service) where T : class
src/WixToolset.Core/UnbindContext.cs
renamed
src/WixToolset.Core/Unbinder.cs
renamed
src/WixToolset.Core/WixToolsetServiceProvider.cs
+2
@@ -40,6 +40,7 @@ namespace WixToolset.Core
40
this.AddService<IDecompileContext>((provider, singletons) => new DecompileContext(provider));
41
this.AddService<ILayoutContext>((provider, singletons) => new LayoutContext(provider));
42
this.AddService<IInscribeContext>((provider, singletons) => new InscribeContext(provider));
43
+ this.AddService<IUnbindContext>((provider, singletons) => new UnbindContext(provider));
44
45
this.AddService<IBindFileWithPath>((provider, singletons) => new BindFileWithPath());
46
this.AddService<IBindPath>((provider, singletons) => new BindPath());
@@ -62,6 +63,7 @@ namespace WixToolset.Core
63
this.AddService<ILibrarian>((provider, singletons) => new Librarian(provider));
64
this.AddService<ILinker>((provider, singletons) => new Linker(provider));
65
this.AddService<IResolver>((provider, singletons) => new Resolver(provider));
66
+ this.AddService<IUnbinder>((provider, singletons) => new Unbinder(provider));
67
68
this.AddService<ILocalizationParser>((provider, singletons) => new LocalizationParser(provider));
69
this.AddService<IVariableResolver>((provider, singletons) => new VariableResolver(provider));