Merge pull request #628 from ikkentim/patch-2

Split hosting extensions into Castle.Windsor.Extensions.Hosting
castleproject · Sep 29, 2022 · 13ff71f · 13ff71f
2 parents fb946e1 + 94a2084
commit 13ff71f
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,14 @@
 
 - Add fast lookup to check for already registered types. (@sqeezy, #618)
 - Change target framework from .NET Standard 1.6 to 2.0 (@generik0, #572)
-- Castle.Windsor.Extensions.DependencyInjection: Change Microsoft.Extensions.Hosting/.Logging dependencies to their abstract counterparts (@ikkentim, #626, #624)
+- Castle.Windsor.Extensions.DependencyInjection: Change Microsoft.Extensions.Logging dependencies to their abstract counterparts (@ikkentim, #626, #624)
 
 Bugfixes:
 - Castle.Windsor.Extensions.DependencyInjection: support parallel containers (@rvdginste, @generik0, #563, #577)
 
+Breaking Changes:
+- Microsoft.Extensions.Hosting related methods have been removed from the Castle.Windsor.Extensions.DependencyInjection package to the Castle.Windsor.Extensions.Hosting package (@ikkentim, #625, #628)
+
 ## 5.1.1 (2020-12-08)
 
 - Upgrade minimum Castle.Core version to 4.4.1 (@generik0, #576)

diff --git a/Castle.Windsor.sln b/Castle.Windsor.sln
@@ -62,6 +62,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScript
 		buildscripts\CommonAssemblyInfo.cs = buildscripts\CommonAssemblyInfo.cs
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Windsor.Extensions.Hosting", "src\Castle.Windsor.Extensions.Hosting\Castle.Windsor.Extensions.Hosting.csproj", "{4F123B9A-F9B3-4F81-A0EC-8C8DEF03298A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -136,6 +138,10 @@ Global
 		{7C2F5733-0E06-4201-A15A-1ED1F3308DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C2F5733-0E06-4201-A15A-1ED1F3308DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C2F5733-0E06-4201-A15A-1ED1F3308DB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F123B9A-F9B3-4F81-A0EC-8C8DEF03298A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F123B9A-F9B3-4F81-A0EC-8C8DEF03298A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F123B9A-F9B3-4F81-A0EC-8C8DEF03298A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F123B9A-F9B3-4F81-A0EC-8C8DEF03298A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -157,6 +163,7 @@ Global
 		{7710F8A2-33D8-40C1-89F5-648577B5DD01} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{7C2F5733-0E06-4201-A15A-1ED1F3308DB4} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{DD7F7887-F27C-4C52-AA41-0F386D4D9996} = {7E507A42-984B-470D-8A0C-648B9AF8E1DC}
+		{4F123B9A-F9B3-4F81-A0EC-8C8DEF03298A} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CC2A1EB6-49EC-4064-AD8B-29439E8A45E4}

diff --git a/buildscripts/build.cmd b/buildscripts/build.cmd
@@ -40,6 +40,7 @@ dotnet restore ./src/Castle.Facilities.AspNetCore/Castle.Facilities.AspNetCore.c
 dotnet restore ./src/Castle.Facilities.AspNetCore.Tests/Castle.Facilities.AspNetCore.Tests.csproj
 dotnet restore ./src/Castle.Windsor.Extensions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj
 dotnet restore ./src/Castle.Windsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj
+dotnet restore ./src/Castle.Windsor.Extensions.Hosting/Castle.Windsor.Extensions.Hosting.csproj
 dotnet restore ./src/Castle.Facilities.WcfIntegration/Castle.Facilities.WcfIntegration.csproj
 dotnet restore ./src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj
 dotnet restore ./src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj
@@ -74,6 +75,7 @@ GOTO nuget_explicit_versions
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.windsor"
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.loggingfacility"
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.windsor.extensions.dependencyinjection"
+.\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.windsor.extensions.hosting"
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.facilities.aspnetcore"
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.facilities.aspnet.mvc"
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle.facilities.aspnet.webapi"

diff --git a/docs/net-dependency-extension.md b/docs/net-dependency-extension.md
@@ -30,7 +30,7 @@ Because there are subtle differences between .NET and Castle Windsor lifestyle s
 ### Using the .NET lifestyle semantics
 All services injected into controllers will have to be registered with the lifestyles described in "Services lifestyle"
 
-1. Add `Castle.Windsor.Extensions.DependencyInjection` package to your application.
+1. Add `Castle.Windsor.Extensions.Hosting` package to your application.
 2. Add `UseWindsorContainerServiceProvider()` when creating the Host
     ```
     Host.CreateDefaultBuilder(args)

diff --git a/...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj b/...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj
@@ -21,7 +21,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.3" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.3" />
 	</ItemGroup>

diff --git a/src/Castle.Windsor.Extensions.Hosting/Castle.Windsor.Extensions.Hosting.csproj b/src/Castle.Windsor.Extensions.Hosting/Castle.Windsor.Extensions.Hosting.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+
+  <Import Project="..\..\buildscripts\common.props"></Import>
+
+	<PropertyGroup>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<PackageId>Castle.Windsor.Extensions.Hosting</PackageId>
+		<Title>Castle Windsor extension for .NET Extensions Hosting</Title>
+		<Description>Allows to use Castle Windsor as a container using IServiceProvider</Description>
+		<PackageTags>castle, windsor, inversionOfControl, DependencyInjection, aspnet, core</PackageTags>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);NU5125</NoWarn> <!-- remove once tools are truly ready for NuGet's new 'license' element -->
+		<AssemblyName>Castle.Windsor.Extensions.Hosting</AssemblyName>
+		<RootNamespace>Castle.Windsor.Extensions.Hosting</RootNamespace>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.3" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\Castle.Windsor.Extensions.DependencyInjection\Castle.Windsor.Extensions.DependencyInjection.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/...ction/Extensions/HostBuilderExtensions.cs → ...sting/Extensions/HostBuilderExtensions.cs b/...ction/Extensions/HostBuilderExtensions.cs → ...sting/Extensions/HostBuilderExtensions.cs