Skip to content

Commit 1470edb

Browse files
jeremydmillerclaude
jeremydmiller
and
claude
committed
Target net9.0;net10.0 and bump to 16.0.0
Drop all target frameworks below .NET 9 across the solution and ensure the published nugets (Lamar, Lamar.Microsoft.DependencyInjection) target net9.0;net10.0 at version 16.0.0. Remove dead net6.0/net8.0 conditional package groups and the .NET 8 SDK setup in CI workflows. Closes #427 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 369c837 commit 1470edb

25 files changed

Lines changed: 26 additions & 67 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
uses: actions/setup-dotnet@v3
3131
with:
3232
dotnet-version: 9.0.x
33-
- name: Setup .NET 8
34-
uses: actions/setup-dotnet@v3
35-
with:
36-
dotnet-version: 8.0.x
3733

3834

3935
- name: Test

‎.github/workflows/publish_lamar.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ jobs:
2020
with:
2121
dotnet-version: 9.0.x
2222

23-
- name: Setup .NET
24-
uses: actions/setup-dotnet@v1
25-
with:
26-
dotnet-version: 8.0.x
27-
2823
- name: Build
2924
run: dotnet build Lamar.sln --configuration Release
3025

‎src/Aspect.Logger/Widget.Aspect.Logger.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -17,24 +17,6 @@
1717
<PackageReference Include="coverlet.collector" Version="1.0.1" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.0,7.0.0)" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.0,7.0.0)" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[6.0.0,7.0.0)" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.0,7.0.0)" />
25-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[6.0.0,7.0.0)" />
26-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[6.0.0,7.0.0)" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
30-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.0,9.0.0)" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0,9.0.0)" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[8.0.0,9.0.0)" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.0,9.0.0)" />
34-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[8.0.0,9.0.0)" />
35-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[8.0.0,9.0.0)" />
36-
</ItemGroup>
37-
3820
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
3921
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[9.0.0,10.0.0)" />
4022
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0,10.0.0)" />

‎src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

@@ -21,15 +21,7 @@
2121
<PackageReference Include="Shouldly" Version="4.2.1" />
2222
</ItemGroup>
2323

24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
25-
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="[6.0.0,7.0.0)" />
26-
</ItemGroup>
27-
28-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
29-
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="[8.0.0,9.0.0)" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
24+
<ItemGroup>
3325
<ProjectReference Include="..\Lamar.Microsoft.DependencyInjection\Lamar.Microsoft.DependencyInjection.csproj" />
3426
</ItemGroup>
3527

‎src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Lamar Adapter for HostBuilder Integration</Description>
4-
<Version>15.1.0</Version>
4+
<Version>16.0.0</Version>
55
<Authors>Jeremy D. Miller</Authors>
6-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
77
<DebugType>portable</DebugType>
88
<AssemblyName>Lamar.Microsoft.DependencyInjection</AssemblyName>
99
<PackageId>Lamar.Microsoft.DependencyInjection</PackageId>

‎src/Lamar.Testing/Lamar.Testing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
44
<LangVersion>10.0</LangVersion>
55
</PropertyGroup>
66
<ItemGroup>

‎src/Lamar/Lamar.csproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Fast ASP.Net Core compatible IoC Tool, Successor to StructureMap</Description>
4-
<Version>15.1.0</Version>
4+
<Version>16.0.0</Version>
55
<Authors>Jeremy D. Miller</Authors>
6-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
77
<DebugType>portable</DebugType>
88
<AssemblyName>Lamar</AssemblyName>
99
<PackageId>Lamar</PackageId>
@@ -26,12 +26,6 @@
2626
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
2727
</ItemGroup>
2828

29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
31-
<PackageReference Include="System.Runtime.Loader" Version="4.3.0"/>
32-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0"/>
33-
</ItemGroup>
34-
3529
<ItemGroup>
3630
<PackageReference Include="JasperFx" Version="1.10.1" />
3731
</ItemGroup>

‎src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)
⚡