Skip to content

Commit e53166a

Browse files
gunndabadgunndabad
committed
Update to .NET 9
1 parent 4e78117 commit e53166a

File tree

54 files changed

+6537
-6596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6537
-6596
lines changed

‎.github/workflows/dbml.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ jobs:
3030

3131
- uses: extractions/setup-just@v2
3232

33+
- uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: '9.0.x'
36+
3337
- name: Install postgresql-client
3438
run: |
3539
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'

‎.github/workflows/package.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323

2424
- uses: extractions/setup-just@v2
2525

26+
- uses: actions/setup-dotnet@v4
27+
with:
28+
dotnet-version: '9.0.x'
29+
2630
- name: Get Docker image tag
2731
id: image_tags
2832
run: |

‎.github/workflows/pr.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323

2424
- uses: extractions/setup-just@v2
2525

26+
- uses: actions/setup-dotnet@v4
27+
with:
28+
dotnet-version: '9.0.x'
29+
2630
- name: Install tools
2731
run: just install-tools
2832

@@ -127,6 +131,10 @@ jobs:
127131

128132
- uses: extractions/setup-just@v2
129133

134+
- uses: actions/setup-dotnet@v4
135+
with:
136+
dotnet-version: '9.0.x'
137+
130138
- name: Install tools
131139
run: just install-tools
132140

@@ -159,7 +167,7 @@ jobs:
159167
- name: Install Playwright if required
160168
run: |
161169
if [[ "$PROJECT_NAME" =~ .*EndToEndTests ]]; then
162-
pwsh ./bin/Release/net8.0/playwright.ps1 install chromium
170+
pwsh ./bin/Release/net9.0/playwright.ps1 install chromium
163171
fi
164172
working-directory: TeachingRecordSystem/tests/${{ matrix.project }}
165173
env:

‎TeachingRecordSystem/.config/dotnet-tools.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-format": {
6-
"version": "8.0.453106",
6+
"version": "9.0.520307",
77
"commands": [
88
"dotnet-format"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"dotnet-ef": {
12-
"version": "8.0.8",
13+
"version": "9.0.0",
1314
"commands": [
1415
"dotnet-ef"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"microsoft.web.librarymanager.cli": {
1820
"version": "2.1.175",
1921
"commands": [
2022
"libman"
21-
]
23+
],
24+
"rollForward": false
2225
}
2326
}
2427
}

‎TeachingRecordSystem/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>12.0</LangVersion>
3+
<LangVersion>13.0</LangVersion>
44
<TreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</TreatWarningsAsErrors>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -10,6 +10,7 @@
1010

1111
<UserSecretsId>TeachingRecordSystem</UserSecretsId>
1212
<UserSecretsId Condition="'$(IsTestProject)' == 'true'">TeachingRecordSystemTests</UserSecretsId>
13+
<TargetFramework Condition="'$(IsSourceGeneratorProject)' != 'true'">net9.0</TargetFramework>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

‎TeachingRecordSystem/Directory.Packages.props

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageVersion Include="AngleSharp" Version="1.1.2" />
10-
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
11-
<PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="8.0.1" />
10+
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
11+
<PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
1212
<PackageVersion Include="AutoMapper" Version="13.0.1" />
1313
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
1414
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
@@ -17,11 +17,11 @@
1717
<PackageVersion Include="CloudNative.CloudEvents.SystemTextJson" Version="2.8.0" />
1818
<PackageVersion Include="CsvHelper" Version="30.1.0" />
1919
<PackageVersion Include="dbup-sqlserver" Version="5.0.37" />
20-
<PackageVersion Include="Dfe.Analytics" Version="0.2.5" />
20+
<PackageVersion Include="Dfe.Analytics" Version="0.2.6" />
2121
<PackageVersion Include="DistributedLock.Azure" Version="1.0.0" />
2222
<PackageVersion Include="DistributedLock.FileSystem" Version="1.0.2" />
23-
<PackageVersion Include="EFCore.NamingConventions" Version="8.0.3" />
24-
<PackageVersion Include="EntityFrameworkCore.Projectables" Version="3.0.4" />
23+
<PackageVersion Include="EFCore.NamingConventions" Version="9.0.0" />
24+
<PackageVersion Include="EntityFrameworkCore.Projectables" Version="4.0.0" />
2525
<PackageVersion Include="Faker.Net" Version="2.0.154" />
2626
<PackageVersion Include="FakeXrmEasy.v9" Version="3.5.0" />
2727
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
@@ -39,24 +39,24 @@
3939
<PackageVersion Include="JustEat.HttpClientInterception" Version="4.3.0" />
4040
<PackageVersion Include="LinqKit" Version="1.2.5" />
4141
<PackageVersion Include="MediatR" Version="12.2.0" />
42-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
43-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
44-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.8" />
45-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.7" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
43+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
44+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
45+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
4646
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
47-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7" />
48-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.7" />
49-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
47+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
48+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
49+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
5050
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
5151
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.8" />
52-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
53-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
54-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
55-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
56-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
57-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
58-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
59-
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
52+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
53+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
54+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
55+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
56+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
57+
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
58+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
59+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
6060
<PackageVersion Include="Microsoft.Identity.Web" Version="2.17.0" />
6161
<PackageVersion Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="2.16.0" />
6262
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
@@ -65,16 +65,16 @@
6565
<PackageVersion Include="Microsoft.PowerPlatform.Dataverse.Client.Dynamics" Version="1.1.27" />
6666
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" />
6767
<PackageVersion Include="Moq" Version="4.20.70" />
68-
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.3" />
69-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
68+
<PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.2" />
69+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
7070
<PackageVersion Include="NSign.AspNetCore" Version="1.1.0" />
7171
<PackageVersion Include="NSign.Client" Version="1.1.0" />
7272
<PackageVersion Include="NSign.SignatureProviders" Version="1.1.0" />
73-
<PackageVersion Include="OpenIddict.AspNetCore" Version="5.2.0" />
74-
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="5.2.0" />
73+
<PackageVersion Include="OpenIddict.AspNetCore" Version="6.0.0" />
74+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.0.0" />
7575
<PackageVersion Include="Optional" Version="4.0.0" />
76-
<PackageVersion Include="Parquet.Net" Version="4.24.0" />
77-
<PackageVersion Include="PdfSharpCore" Version="1.3.62" />
76+
<PackageVersion Include="Parquet.Net" Version="5.0.2" />
77+
<PackageVersion Include="PdfSharpCore" Version="1.3.65" />
7878
<PackageVersion Include="Polly.Core" Version="8.2.1" />
7979
<PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
8080
<PackageVersion Include="RedisRateLimiting.AspNetCore" Version="1.1.0" />
@@ -96,7 +96,7 @@
9696
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
9797
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
9898
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
99-
<PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
99+
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
100100
<PackageVersion Include="System.Reactive" Version="6.0.1" />
101101
<PackageVersion Include="xunit" Version="2.6.2" />
102102
<PackageVersion Include="xunit.assert" Version="2.9.0" />

‎TeachingRecordSystem/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# syntax=docker/dockerfile:1
2-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.18
2+
FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine3.20
33
ARG GIT_SHA
44
ENV SENTRY_RELEASE ${GIT_SHA}
55
ENV GIT_SHA ${GIT_SHA}
66
ENV ASPNETCORE_HTTP_PORTS 3000
7-
COPY src/TeachingRecordSystem.Api/bin/Release/net8.0/publish/ Apps/Api/
8-
COPY src/TeachingRecordSystem.Cli/bin/Release/net8.0/publish/ Apps/TrsCli/
9-
COPY src/TeachingRecordSystem.SupportUi/bin/Release/net8.0/publish/ Apps/SupportUi/
10-
COPY src/TeachingRecordSystem.Worker/bin/Release/net8.0/publish/ Apps/Worker/
11-
COPY src/TeachingRecordSystem.AuthorizeAccess/bin/Release/net8.0/publish/ Apps/AuthorizeAccess/
7+
COPY src/TeachingRecordSystem.Api/bin/Release/net9.0/publish/ Apps/Api/
8+
COPY src/TeachingRecordSystem.Cli/bin/Release/net9.0/publish/ Apps/TrsCli/
9+
COPY src/TeachingRecordSystem.SupportUi/bin/Release/net9.0/publish/ Apps/SupportUi/
10+
COPY src/TeachingRecordSystem.Worker/bin/Release/net9.0/publish/ Apps/Worker/
11+
COPY src/TeachingRecordSystem.AuthorizeAccess/bin/Release/net9.0/publish/ Apps/AuthorizeAccess/
1212
COPY db.sh Apps/db.sh
1313
WORKDIR /Apps
1414

‎TeachingRecordSystem/lib/Dfe.Analytics.0.2.5.nupkg

-26.7 KB
Binary file not shown.

‎TeachingRecordSystem/lib/Dfe.Analytics.0.2.6.nupkg

26.7 KB
Binary file not shown.

‎TeachingRecordSystem/nuget.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
4+
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
55
<add key="lib" value="lib" />
66
</packageSources>
77
<packageSourceMapping>
88
<packageSource key="nuget.org">
99
<package pattern="*" />
1010
</packageSource>
11-
<packageSource key="dotnet8">
11+
<packageSource key="dotnet9">
1212
<package pattern="dotnet-format" />
1313
</packageSource>
1414
<packageSource key="lib">

‎TeachingRecordSystem/src/TeachingRecordSystem.Api/TeachingRecordSystem.Api.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<PackageReference Include="AspNetCore.HealthChecks.Redis" />
95
<PackageReference Include="AutoMapper" />

0 commit comments

Comments
 (0)