Skip to content

Commit eb3589b

Browse files
thomasduftthomasduft
committed
feat: upgrade project to .NET 10.0 and update package references
1 parent ddd6e6b commit eb3589b

File tree

12 files changed

+43
-99
lines changed

12 files changed

+43
-99
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"commands": [
88
"releasy"
99
],
10-
"rollForward": false
10+
"rollForward": true
1111
},
1212
"dotnet-outdated-tool": {
13-
"version": "4.6.8",
13+
"version": "4.6.9",
1414
"commands": [
1515
"dotnet-outdated"
1616
],
17-
"rollForward": false
17+
"rollForward": true
1818
}
1919
}
20-
}
20+
}

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
{
44
"name": "testR",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/dotnet:1-9.0-bookworm",
6+
"image": "mcr.microsoft.com/devcontainers/dotnet",
77
// Features to add to the dev container. More info: https://containers.dev/features.
88
"features": {
9-
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
109
"ghcr.io/devcontainers/features/desktop-lite:1": {}
1110
},
1211
"customizations": {

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: 9.0.x
17+
dotnet-version: 10.0.x
1818
- name: Test
1919
run: ./build.sh test
2020
e2e-test:
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup dotnet
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 9.0.x
28+
dotnet-version: 10.0.x
2929
- name: Build & Install
3030
run: ./build.sh build
3131
- name: Installing chromium browser

‎.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@v4
2121
with:
22-
dotnet-version: 9.0.x
22+
dotnet-version: 10.0.x
2323
- name: Pack
2424
run: ./build.sh pack -rv $RELEASE_VERSION
2525
- name: Push

‎.vscode/launch.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "build:WebApi",
9-
"program": "${workspaceRoot}/samples/WebApi/bin/Debug/net9.0/WebApi.dll",
9+
"program": "${workspaceRoot}/samples/WebApi/bin/Debug/net10.0/WebApi.dll",
1010
"args": [
1111
"--urls",
1212
"https://localhost:5001"
@@ -26,7 +26,7 @@
2626
"type": "coreclr",
2727
"request": "launch",
2828
"preLaunchTask": "build-testR",
29-
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net9.0/tomware.TestR.dll",
29+
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net10.0/tomware.TestR.dll",
3030
"args": [
3131
"run",
3232
"https://localhost:5001",
@@ -45,7 +45,7 @@
4545
"type": "coreclr",
4646
"request": "launch",
4747
"preLaunchTask": "build-testR",
48-
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net9.0/tomware.TestR.dll",
48+
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net10.0/tomware.TestR.dll",
4949
"args": [
5050
"run",
5151
"https://localhost:5001",
@@ -67,7 +67,7 @@
6767
"type": "coreclr",
6868
"request": "launch",
6969
"preLaunchTask": "build-testR",
70-
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net9.0/tomware.TestR.dll",
70+
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net10.0/tomware.TestR.dll",
7171
"args": [
7272
"run",
7373
"https://localhost:5001",
@@ -90,7 +90,7 @@
9090
"type": "coreclr",
9191
"request": "launch",
9292
"preLaunchTask": "build-testR",
93-
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net9.0/tomware.TestR.dll",
93+
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net10.0/tomware.TestR.dll",
9494
"args": [
9595
"run",
9696
"https://commitquality.com/",
@@ -111,7 +111,7 @@
111111
"type": "coreclr",
112112
"request": "launch",
113113
"preLaunchTask": "build-testR",
114-
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net9.0/tomware.TestR.dll",
114+
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net10.0/tomware.TestR.dll",
115115
"args": [
116116
"playwright",
117117
"-c",
@@ -127,7 +127,7 @@
127127
"type": "coreclr",
128128
"request": "launch",
129129
"preLaunchTask": "build-testR",
130-
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net9.0/tomware.TestR.dll",
130+
"program": "${workspaceFolder}/src/testr.Cli/bin/Debug/net10.0/tomware.TestR.dll",
131131
"args": [
132132
"validate",
133133
"TC-Login-001",

‎build/targets.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
@@ -11,4 +11,4 @@
1111
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
1212
<PackageReference Include="SimpleExec" Version="12.0.0" />
1313
</ItemGroup>
14-
</Project>
14+
</Project>

‎samples/WebApi/Api/ApiConfigureService.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ IWebHostEnvironment environment
3131
options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
3232
});
3333

34-
if (environment.IsDevelopment())
35-
{
36-
// Swagger
37-
services.AddSwaggerDocumentation();
38-
}
39-
4034
return services;
4135
}
42-
}
36+
}

‎samples/WebApi/ConfigureApplication.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ IWebHostEnvironment environment
2323
builder.AllowCredentials();
2424
});
2525

26-
app.UseSwaggerDocumentation();
27-
2826
app.UseDeveloperExceptionPage();
2927
}
3028
else
@@ -83,4 +81,4 @@ private static void ConsiderSpaRoutes(IApplicationBuilder app)
8381
await next();
8482
});
8583
}
86-
}
84+
}

‎samples/WebApi/Extensions/SwaggerServiceExtensions.cs‎

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

‎samples/WebApi/WebApi.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.9" />
12-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
15-
<PrivateAssets>all</PrivateAssets>
16-
</PackageReference>
17-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.9" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.11" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.11" />
14+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.0" />
1815

19-
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.0" />
20-
<PackageReference Include="OpenIddict.AspNetCore" Version="7.1.0" />
21-
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="7.1.0" />
22-
<PackageReference Include="OpenIddict.Quartz" Version="7.1.0" />
16+
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" />
17+
<PackageReference Include="OpenIddict.AspNetCore" Version="7.2.0" />
18+
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="7.2.0" />
19+
<PackageReference Include="OpenIddict.Quartz" Version="7.2.0" />
2320

24-
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
25-
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
21+
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
22+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
2623
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
2724
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771" />
28-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
2926

3027
<PackageReference Include="tomware.Microwf.AspNetCoreEngine" Version="3.3.0" />
3128
</ItemGroup>

0 commit comments

Comments
 (0)