Skip to content

Commit ebb0088

Browse files
carlsixsmith-mojcarlsixsmith-moj
authored
Update codebase to .NET 10 (#847)
Upgrade to .NET 10 - Updates .NET SDK and package dependencies to version 10 - Upgrades Aspire SDK, EF Core, and related libraries - Updates Cake tool to version 6.0.0 - Resolves EF issue with Owns relationship on a table - Updates GitHub Actions workflows to use .NET 10 - Migrates build process from Cake to dotnet CLI commands - Removes obsolete database migration scripts (migration.cake, ModifyDatabase.ps1) - Updates README with new build and database update processes Updates copyright year and removes seed path Updates the copyright year in the application settings to reflect the current year. Removes the seed path from the configuration file as it is no longer required.
1 parent 5689656 commit ebb0088

18 files changed

Lines changed: 86 additions & 335 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,12 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "9.0.9",
6+
"version": "10.0.0",
77
"commands": [
88
"dotnet-ef"
99
],
1010
"rollForward": false
1111
},
12-
"cake.tool": {
13-
"version": "5.1.0",
14-
"commands": [
15-
"dotnet-cake"
16-
],
17-
"rollForward": false
18-
},
1912
"dotnet-outdated-tool": {
2013
"version": "4.6.8",
2114
"commands": [
@@ -24,7 +17,7 @@
2417
"rollForward": false
2518
},
2619
"aspire.cli": {
27-
"version": "9.5.1",
20+
"version": "13.0.0",
2821
"commands": [
2922
"aspire"
3023
],

‎.github/workflows/create-release.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,22 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v4
1818
with:
19-
dotnet-version: '9.0.x'
19+
dotnet-version: '10.0.x'
2020

21-
- name: Restore Cake Tool
22-
run: dotnet tool restore
21+
- name: Restore
22+
run: dotnet restore ./
2323

24-
- name: Build, Test & Publish
25-
run: dotnet cake build.cake
24+
- name: Build
25+
run: dotnet build ./cats.sln --configuration Release --no-restore
26+
27+
- name: Test
28+
run: dotnet test ./ --configuration Release --no-build --no-restore
29+
30+
- name: Publish UI
31+
run: dotnet publish ./src/Server.UI/Server.UI.csproj --configuration Release --output ./artifacts/publish/Server.UI --no-restore --no-build
32+
33+
- name: Publish Migrations
34+
run: dotnet publish ./src/DatabaseMigrator/DatabaseMigrator.csproj --configuration Release --output ./artifacts/publish/DatabaseMigrator --no-restore --no-build
2635

2736
# Create zip archive of build artifacts for release
2837
# This creates the necessary ./artifacts.zip file on the runner's filesystem.

‎.github/workflows/run-tests.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ jobs:
1414
- name: Setup .NET Core
1515
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '9.0.x'
17+
dotnet-version: '10.0.x'
1818

19-
- name: Restore Cake Tool
20-
run: dotnet tool restore
19+
- name: Restore
20+
run: dotnet restore ./
2121

22-
- name: Build, Test
23-
run: dotnet cake build.cake --target=Test
22+
- name: Build
23+
run: dotnet build ./cats.sln --configuration Release --no-restore
24+
25+
- name: Test
26+
run: dotnet test ./ --configuration Release --no-build --no-restore

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<WarningsNotAsErrors>CS8785</WarningsNotAsErrors>
1010

1111
<!-- Common parameters -->
12-
<TargetFramework>net9.0</TargetFramework>
12+
<TargetFramework>net10.0</TargetFramework>
1313
<LangVersion>default</LangVersion>
1414
<Nullable>enable</Nullable>
1515
<ImplicitUsings>enable</ImplicitUsings>

‎Directory.Packages.props‎

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,32 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5+
<PropertyGroup>
6+
<NoWarn>NU1608</NoWarn>
7+
</PropertyGroup>
58
<ItemGroup>
6-
<PackageVersion Include="ActualLab.Fusion" Version="10.5.51" />
7-
<PackageVersion Include="ActualLab.Fusion.Blazor" Version="10.5.51" />
8-
<PackageVersion Include="ActualLab.Fusion.Ext.Services" Version="10.5.51" />
9-
<PackageVersion Include="ActualLab.Generators" Version="10.5.51" />
9+
<PackageVersion Include="ActualLab.Fusion" Version="11.1.4" />
10+
<PackageVersion Include="ActualLab.Fusion.Blazor" Version="11.1.4" />
11+
<PackageVersion Include="ActualLab.Fusion.Ext.Services" Version="11.1.4" />
12+
<PackageVersion Include="ActualLab.Generators" Version="11.1.4" />
1013
<PackageVersion Include="Ardalis.SmartEnum" Version="8.2.0" />
1114
<PackageVersion Include="Ardalis.Specification" Version="9.3.1" />
1215
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="9.3.1" />
13-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.1" />
14-
<PackageVersion Include="Aspire.Hosting.Kubernetes" Version="9.4.1-preview.1.25408.4" />
15-
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.5.1" />
16-
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.1" />
16+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
17+
<PackageVersion Include="Aspire.Hosting.Kubernetes" Version="13.0.0-preview.1.25560.3" />
18+
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="13.0.0" />
19+
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="13.0.0" />
1720
<PackageVersion Include="AutoMapper" Version="14.0.0" />
18-
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.6" />
19-
<PackageVersion Include="AWSSDK.S3" Version="4.0.7.9" />
21+
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.11" />
22+
<PackageVersion Include="AWSSDK.S3" Version="4.0.11.1" />
2023
<PackageVersion Include="Blazor-Analytics" Version="4.0.0" />
2124
<PackageVersion Include="Blazor-ApexCharts" Version="6.0.2" />
2225
<PackageVersion Include="BlazorDownloadFile" Version="2.4.0.2" />
2326
<PackageVersion Include="BlazorTime" Version="1.0.3" />
2427
<PackageVersion Include="ClosedXML" Version="0.105.0" />
25-
<PackageVersion Include="CodeBeam.MudBlazor.Extensions" Version="8.2.4" />
26-
<PackageVersion Include="FluentValidation" Version="12.0.0" />
27-
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
28+
<PackageVersion Include="CodeBeam.MudBlazor.Extensions" Version="8.2.5" />
29+
<PackageVersion Include="FluentValidation" Version="12.1.0" />
30+
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.0" />
2831
<PackageVersion Include="GovukNotify" Version="7.2.0" />
2932
<PackageVersion Include="Humanizer" Version="2.14.1" />
3033
<PackageVersion Include="Humanizer.Core.uk" Version="2.14.1" />
@@ -34,47 +37,49 @@
3437
<PackageVersion Include="MediatR" Version="12.5.0" />
3538
<PackageVersion Include="MemoryPack.Generator" Version="1.21.4" />
3639
<PackageVersion Include="MessagePack" Version="3.1.4" />
37-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.9" />
38-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.9" />
39-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.9" />
40-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
41-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.9" />
42-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
43-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
44-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9" />
45-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.9" />
46-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
47-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
48-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9" />
49-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
50-
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
51-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
40+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
41+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" />
43+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
44+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
45+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.2" />
46+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
47+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
48+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
49+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
50+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
51+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
52+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
53+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
54+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
55+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
56+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
5257
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="9.0.6" />
53-
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.9" />
54-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1" />
55-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
56-
<PackageVersion Include="MudBlazor" Version="8.13.0" />
58+
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.0" />
59+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
60+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
61+
<PackageVersion Include="MudBlazor" Version="8.14.0" />
5762
<PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
5863
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
5964
<PackageVersion Include="NUnit" Version="4.4.0" />
6065
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
6166
<PackageVersion Include="NunitXml.TestLogger" Version="7.0.2" />
6267
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
6368
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
64-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
65-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
66-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
67-
<PackageVersion Include="Quartz" Version="3.15.0" />
68-
<PackageVersion Include="Quartz.AspNetCore" Version="3.15.0" />
69-
<PackageVersion Include="Rebus" Version="8.8.0" />
70-
<PackageVersion Include="Rebus.RabbitMq" Version="10.0.3" />
71-
<PackageVersion Include="Rebus.ServiceProvider" Version="10.5.0" />
69+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
70+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
71+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
72+
<PackageVersion Include="Quartz" Version="3.15.1" />
73+
<PackageVersion Include="Quartz.AspNetCore" Version="3.15.1" />
74+
<PackageVersion Include="Rebus" Version="8.9.0" />
75+
<PackageVersion Include="Rebus.RabbitMq" Version="10.1.0" />
76+
<PackageVersion Include="Rebus.ServiceProvider" Version="10.6.0" />
7277
<PackageVersion Include="Scrutor" Version="6.1.0" />
73-
<PackageVersion Include="Sentry" Version="5.16.0" />
74-
<PackageVersion Include="Sentry.AspNetCore" Version="5.16.0" />
75-
<PackageVersion Include="Sentry.EntityFramework" Version="5.16.0" />
78+
<PackageVersion Include="Sentry" Version="5.16.2" />
79+
<PackageVersion Include="Sentry.AspNetCore" Version="5.16.2" />
80+
<PackageVersion Include="Sentry.EntityFramework" Version="5.16.2" />
7681
<PackageVersion Include="Shouldly" Version="4.3.0" />
77-
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.9" />
82+
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.10" />
7883
<PackageVersion Include="Toolbelt.Blazor.HotKeys2" Version="6.0.1" />
7984
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
8085
</ItemGroup>

‎ModifyDatabase.ps1‎

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

0 commit comments

Comments
 (0)