Skip to content

Commit bf49161

Browse files
committed
Merged PR for .NET 8 support
Merged PR 668 castleproject#668, created .net 8 versions of dlls and created local packages for internal consumption
1 parent 77216d1 commit bf49161

File tree

38 files changed

+2283
-107
lines changed

38 files changed

+2283
-107
lines changed

buildscripts/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<NoWarn>$(NoWarn);CS1591;NU5048</NoWarn>
55
<RepositoryType>git</RepositoryType>
66
<RepositoryUrl>https://github.com/castleproject/Windsor</RepositoryUrl>
7-
<BuildVersion>0.0.0</BuildVersion>
7+
<BuildVersion>6.0.0</BuildVersion>
88
<BuildVersion Condition="'$(APPVEYOR_BUILD_VERSION)'!=''">$(APPVEYOR_BUILD_VERSION)</BuildVersion>
99
<BuildVersionMajor>$(BuildVersion.Split('.')[0])</BuildVersionMajor>
1010
<BuildVersionNoSuffix>$(BuildVersion.Split('-')[0])</BuildVersionNoSuffix>

src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<Import Project="..\..\buildscripts\common.props"></Import>
88

99
<PropertyGroup>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11-
<PackageId>Castle.LoggingFacility</PackageId>
11+
<PackageId>FoldingSpace.Castle.LoggingFacility</PackageId>
1212
<Title>Castle Windsor logging facility</Title>
1313
<Description>Castle Windsor logging facility lets you easily inject loggers into your components. It offers integration with most popular 3rd party logging frameworks like log4net, NLog and Serilog (see Castle Core docs).</Description>
1414
<PackageTags>castle, windsor, inversionOfControl, DependencyInjection, logging, log4net, nlog</PackageTags>

src/Castle.Windsor.Extensions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77

@@ -13,10 +13,10 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1515
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
16-
<PackageReference Include="xunit" Version="2.4.1" />
16+
<!--<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.assert" Version="2.4.1" />
1818
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />-->
2020
</ItemGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
@@ -29,6 +29,14 @@
2929
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="6.0.0" />
3030
</ItemGroup>
3131

32+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
33+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
39+
</ItemGroup>
3240
<ItemGroup>
3341
<ProjectReference Include="..\Castle.Windsor.Extensions.DependencyInjection\Castle.Windsor.Extensions.DependencyInjection.csproj" />
3442
</ItemGroup>

0 commit comments

Comments
 (0)