Skip to content

Commit 2fd6caa

Browse files
thomasduftthomasduft
committed
chore: Upgrade to .NET 9.0 and update related package references
1 parent d2a3a0d commit 2fd6caa

File tree

24 files changed

+129
-150
lines changed

24 files changed

+129
-150
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
"isRoot": true,
44
"tools": {
55
"tomware.releasy": {
6-
"version": "0.11.0",
6+
"version": "0.12.1",
77
"commands": [
88
"releasy"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"dotnet-outdated-tool": {
12-
"version": "4.6.1",
13+
"version": "4.6.7",
1314
"commands": [
1415
"dotnet-outdated"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"dotnet-ef": {
18-
"version": "8.0.4",
20+
"version": "9.0.2",
1921
"commands": [
2022
"dotnet-ef"
21-
]
23+
],
24+
"rollForward": false
2225
}
2326
}
2427
}

‎.devcontainer/Dockerfile‎

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

‎.devcontainer/devcontainer.json‎

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,30 @@
11
{
22
"name": "openiddict-ui",
3-
"build": {
4-
"dockerfile": "Dockerfile",
5-
"args": {
6-
// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1
7-
"VARIANT": "8.0",
8-
// Options
9-
"INSTALL_NODE": "true",
10-
"NODE_VERSION": "lts/*",
11-
"INSTALL_AZURE_CLI": "false"
3+
"image": "mcr.microsoft.com/devcontainers/dotnet:1-9.0-bookworm",
4+
"features": {
5+
"ghcr.io/devcontainers/features/node:1": {
6+
"installNodeVersion": "lts/*"
7+
}
8+
},
9+
"customizations": {
10+
"vscode": {
11+
"extensions": [
12+
"eamodio.gitlens",
13+
"editorconfig.editorconfig",
14+
"github.vscode-pull-request-github",
15+
"mikestead.dotenv",
16+
"minhthai.vscode-todo-parser",
17+
"ms-dotnettools.csharp",
18+
"ms-dotnettools.csdevkit"
19+
]
1220
}
1321
},
14-
// Set *default* container specific settings.json values on container create.
15-
"settings": {},
16-
// Add the IDs of extensions you want installed when the container is created.
17-
"extensions": [
18-
"formulahendry.dotnet-test-explorer",
19-
"minhthai.vscode-todo-parser",
20-
"ms-dotnettools.csharp",
21-
"ryanluker.vscode-coverage-gutters"
22-
],
2322
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2423
"forwardPorts": [
2524
4200,
2625
5000,
2726
5001,
2827
5002
2928
],
30-
// [Optional] To reuse of your local HTTPS dev cert:
31-
//
32-
// 1. Export it locally using this command:
33-
// * Windows PowerShell:
34-
// dotnet dev-certs https --trust; dotnet dev-certs https -ep "$env:USERPROFILE/.aspnet/https/aspnetapp.pfx" -p "SecurePwdGoesHere"
35-
// * macOS/Linux terminal:
36-
// dotnet dev-certs https --trust; dotnet dev-certs https -ep "${HOME}/.aspnet/https/aspnetapp.pfx" -p "SecurePwdGoesHere"
37-
//
38-
// 2. Uncomment these 'remoteEnv' lines:
39-
// "remoteEnv": {
40-
// "ASPNETCORE_Kestrel__Certificates__Default__Password": "SecurePwdGoesHere",
41-
// "ASPNETCORE_Kestrel__Certificates__Default__Path": "/home/vscode/.aspnet/https/aspnetapp.pfx",
42-
// },
43-
//
44-
// 3. Do one of the following depending on your scenario:
45-
// * When using GitHub Codespaces and/or Remote - Containers:
46-
// 1. Start the container
47-
// 2. Drag ~/.aspnet/https/aspnetapp.pfx into the root of the file explorer
48-
// 3. Open a terminal in VS Code and run "mkdir -p /home/vscode/.aspnet/https && mv aspnetapp.pfx /home/vscode/.aspnet/https"
49-
//
50-
// * If only using Remote - Containers with a local container, uncomment this line instead:
51-
// "mounts": [ "source=${env:HOME}${env:USERPROFILE}/.aspnet/https,target=/home/vscode/.aspnet/https,type=bind" ],
52-
// Use 'postCreateCommand' to run commands after the container is created.
53-
// "postCreateCommand": "dotnet restore",
54-
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
55-
"remoteUser": "vscode"
29+
"postCreateCommand": "dotnet dev-certs https --trust"
5630
}

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v1
1616
with:
17-
dotnet-version: 8.0.x
17+
dotnet-version: 9.0.x
1818
- name: Test
19-
run: ./build.sh test
19+
run: ./build.sh test

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET
2020
uses: actions/setup-dotnet@v1
2121
with:
22-
dotnet-version: 8.0.x
22+
dotnet-version: 9.0.x
2323
- name: Pack
2424
run: ./build.sh "pack --version=$RELEASE_VERSION"
2525
- name: Push

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "build-server",
9-
"program": "${workspaceFolder}/samples/Server/bin/Debug/net8.0/Server.dll",
9+
"program": "${workspaceFolder}/samples/Server/bin/Debug/net9.0/Server.dll",
1010
"args": [
1111
"--urls",
1212
"https://localhost:5001"
@@ -29,7 +29,7 @@
2929
"type": "coreclr",
3030
"request": "launch",
3131
"preLaunchTask": "build-api",
32-
"program": "${workspaceFolder}/samples/Api/bin/Debug/net8.0/Api.dll",
32+
"program": "${workspaceFolder}/samples/Api/bin/Debug/net9.0/Api.dll",
3333
"args": [
3434
"--urls",
3535
"https://localhost:5002"

‎build/targets.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-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎changelogs/1b74ec6f063b4d7590895a2846a15a0c.cle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"Id": "1b74ec6f-063b-4d75-9089-5a2846a15a0c",
3+
"IssueId": "",
4+
"Prefix": "Added",
5+
"Tag": "",
6+
"Message": "Added support for .NET 9.0.",
7+
"CreatedAt": "2025-03-05T11:27:47.6270661+00:00",
8+
"CreatedBy": "thomasduft"
9+
}

‎samples/Api/Api.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
10-
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="5.8.0" />
11-
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="5.8.0" />
9+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
10+
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="6.1.1" />
11+
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" Version="6.1.1" />
1212
</ItemGroup>
1313

1414
</Project>

‎samples/Server/ConfigureServices.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ string environmentName
9191

9292
// Enable the authorization, device, logout, token, userinfo and verification endpoints.
9393
options.SetAuthorizationEndpointUris("connect/authorize")
94-
.SetLogoutEndpointUris("connect/logout")
94+
.SetEndSessionEndpointUris("connect/logout")
9595
.SetTokenEndpointUris("connect/token")
9696
.SetIntrospectionEndpointUris("connect/introspect")
97-
.SetUserinfoEndpointUris("connect/userinfo");
97+
.SetUserInfoEndpointUris("connect/userinfo");
9898

9999
// Note: this sample uses the code, device, password and refresh token flows, but you
100100
// can enable the other flows if you need to support implicit or client credentials.
@@ -130,9 +130,9 @@ string environmentName
130130
options.UseAspNetCore()
131131
.EnableStatusCodePagesIntegration()
132132
.EnableAuthorizationEndpointPassthrough()
133-
.EnableLogoutEndpointPassthrough()
133+
.EnableEndSessionEndpointPassthrough()
134134
.EnableTokenEndpointPassthrough()
135-
.EnableUserinfoEndpointPassthrough();
135+
.EnableUserInfoEndpointPassthrough();
136136
// .DisableTransportSecurityRequirement(); // During development, you can disable the HTTPS requirement.
137137

138138
if (configuration.GetValue("DisableAccessTokenEncryption", false))
@@ -169,10 +169,10 @@ string environmentName
169169
.AddUIApis(options =>
170170
{
171171
// Tell the system about the allowed Permissions it is built/configured for.
172-
options.Permissions =
172+
options.Permissions =
173173
[
174174
Permissions.Endpoints.Authorization,
175-
Permissions.Endpoints.Logout,
175+
Permissions.Endpoints.EndSession,
176176
Permissions.Endpoints.Token,
177177
Permissions.Endpoints.Introspection,
178178
Permissions.GrantTypes.AuthorizationCode,

0 commit comments

Comments
 (0)