Skip to content

Commit 7e9bae9

Browse files
feat!: upgrade to .NET 10 (#112)
## Summary - Update target framework from net9.0 to net10.0 - Update EF Core packages to 10.0.5 - Replace legacy Microsoft.AspNetCore.Mvc 2.x NuGet package with FrameworkReference to Microsoft.AspNetCore.App - Pin SDK version via global.json (latestPatch rollforward) - Update all CI/CD workflows to .NET 10 SDK - 627/627 tests pass with zero warnings **Breaking Change:** Applications must target .NET 10 or later.
1 parent 80edccb commit 7e9bae9

13 files changed

Lines changed: 257 additions & 2602 deletions

File tree

.github/workflows/build-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup .NET
3434
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
3535
with:
36-
dotnet-version: 9.0.x
36+
dotnet-version: 10.0.x
3737

3838
- name: Build Documentation
3939
run: docfx docs/docfx.json

.github/workflows/ci-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup .NET
2929
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
3030
with:
31-
dotnet-version: 9.x
31+
dotnet-version: 10.0.x
3232

3333
- name: Restore
3434
run: dotnet restore --locked-mode
@@ -54,7 +54,7 @@ jobs:
5454
- name: Setup .NET
5555
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
5656
with:
57-
dotnet-version: 9.x
57+
dotnet-version: 10.0.x
5858
source-url: https://nuget.pkg.github.com/Intility/index.json
5959
env:
6060
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_AUTH_TOKEN }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup .NET
2626
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
2727
with:
28-
dotnet-version: 9.x
28+
dotnet-version: 10.0.x
2929

3030
- name: Initialize CodeQL
3131
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ test.json
393393
restore_db.sh
394394
wsl-docker-compose.sh
395395

396-
# Ignore asdf-vm files
397-
.tool-versions
398396
# WSL
399397
*.deb
400398

.tool-versions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
dotnet-core 10.0.100
2+
dotnet 10.0.100

Directory.Build.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
33
<RuntimeIdentifier>linux-musl-x64</RuntimeIdentifier>
44
</PropertyGroup>
5-
65
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64'">
76
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
87
<NuGetLockFilePath>$(MSBuildProjectDirectory)\packages.lock.json</NuGetLockFilePath>
98
</PropertyGroup>
9+
<PropertyGroup>
10+
<NuGetAudit>true</NuGetAudit>
11+
<NuGetAuditMode>all</NuGetAuditMode>
12+
<NuGetAuditLevel>moderate</NuGetAuditLevel>
13+
</PropertyGroup>
1014
</Project>

JsonApiToolkit.Tests/JsonApiToolkit.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="coverlet.collector" Version="8.0.1" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.14" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.14" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
1515
<PackageReference Include="moq" Version="4.20.72" />
1616
<PackageReference Include="xunit" Version="2.9.3" />

JsonApiToolkit/JsonApiToolkit.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66

@@ -23,12 +23,10 @@
2323
<InternalsVisibleTo Include="JsonApiToolkit.Tests"/>
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="10.0.5"/>
26+
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
2727
<PackageReference Include="Intility.Logging.AspNetCore" Version="3.1.4"/>
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.3.9"/>
29-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.14"/>
30-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.14"/>
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5"/>
28+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5"/>
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5"/>
3230
</ItemGroup>
3331
<ItemGroup>
3432
<None Include="README.md" Pack="true" PackagePath="\"/>

JsonApiToolkit/README.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)