Skip to content

Commit 9acc848

Browse files
GZTimeWalkerCopilot
GZTimeWalker
and
Copilot
authored
chore(deps): upgrade project to .NET 10 (#524)
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
1 parent 6ffaab0 commit 9acc848

39 files changed

+1376
-1310
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-24.04
16+
runs-on: ubuntu-latest
1717
permissions:
1818
contents: read
1919
packages: write

‎src/Directory.Packages.props‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
88
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.0.0" />
99
<PackageVersion Include="Aspire.Hosting.Redis" Version="13.0.0" />
10-
<PackageVersion Include="AWSSDK.S3" Version="4.0.11.3" />
10+
<PackageVersion Include="AWSSDK.S3" Version="4.0.13.1" />
1111
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.4.0" />
1212
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
1313
<PackageVersion Include="Cronos" Version="0.11.1" />
@@ -16,44 +16,41 @@
1616
<PackageVersion Include="KubernetesClient" Version="18.0.5" />
1717
<PackageVersion Include="MailKit" Version="4.14.1" />
1818
<PackageVersion Include="MemoryPack" Version="1.21.4" />
19-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.11" />
20-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.11" />
21-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
22-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.11" />
23-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.11" />
24-
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.11" />
25-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.11" />
26-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
27-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.11" />
28-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.11" />
29-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.11" />
30-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.11" />
31-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="9.10.0" />
32-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.11" />
34-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.2" />
19+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0" />
20+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
21+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
22+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="10.0.0" />
23+
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="10.0.0" />
24+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
25+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
26+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="10.0.0" />
27+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
28+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
29+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.0.0" />
30+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
31+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
3532
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
36-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
37-
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.4" />
33+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
34+
<PackageVersion Include="Npgsql.OpenTelemetry" Version="10.0.0" />
3835
<PackageVersion Include="NPOI" Version="2.7.5" />
39-
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.2" />
40-
<PackageVersion Include="NSwag.MSBuild" Version="14.6.2" />
36+
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.3" />
37+
<PackageVersion Include="NSwag.MSBuild" Version="14.6.3" />
4138
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
4239
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
43-
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.13.1-beta.1" />
40+
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.14.0-beta.1" />
4441
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
4542
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
4643
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.14.0" />
47-
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.13.0-beta.1" />
48-
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.13.0-beta.1" />
44+
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.14.0-beta.1" />
45+
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.14.0-beta.1" />
4946
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
50-
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.13.0-beta.1" />
47+
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.14.0-beta.1" />
5148
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
52-
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.13.0-beta.1" />
53-
<PackageVersion Include="Scalar.AspNetCore" Version="2.10.3" />
49+
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.14.0-beta.1" />
50+
<PackageVersion Include="Scalar.AspNetCore" Version="2.11.0" />
5451
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
5552
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
56-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
53+
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
5754
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
5855
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
5956
<PackageVersion Include="Serilog.Sinks.File.Archive" Version="1.0.6" />
@@ -62,7 +59,7 @@
6259
<PackageVersion Include="SimpleBase" Version="5.6.0" />
6360
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
6461
<PackageVersion Include="SharpPcap" Version="6.3.1" />
65-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
62+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
6663
<PackageVersion Include="PacketDotNet" Version="1.4.8" />
6764
<PackageVersion Include="Testcontainers.K3s" Version="4.8.1" />
6865
<PackageVersion Include="Testcontainers.Minio" Version="4.8.1" />

‎src/GZCTF.AppHost/GZCTF.AppHost.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsAspireHost>true</IsAspireHost>

‎src/GZCTF.AppHost/MinIO/MinIOResource.cs‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,11 @@ class MinIOResource(string name, string? accessKey = null, string? secretKey = n
3737
internal const int DefaultApiPort = 9000;
3838
internal const int DefaultConsolePort = 9001;
3939

40-
private EndpointReference? _apiReference;
41-
private EndpointReference? _consoleReference;
42-
4340
private EndpointReference ApiEndpoint =>
44-
_apiReference ??= new EndpointReference(this, ApiEndpointName);
41+
field ??= new EndpointReference(this, ApiEndpointName);
4542

4643
private EndpointReference ConsoleEndpoint =>
47-
_consoleReference ??= new EndpointReference(this, ConsoleEndpointName);
44+
field ??= new EndpointReference(this, ConsoleEndpointName);
4845

4946
public ReferenceExpression ConnectionStringExpression =>
5047
ReferenceExpression.Create(
@@ -85,18 +82,17 @@ internal static IResourceBuilder<MinIOResource> AddMinIO(
8582
.WithArgs("server", "/data", "--console-address", $":{MinIOResource.DefaultConsolePort}");
8683
}
8784

88-
private static IResourceBuilder<MinIOResource> ConfigureCredentials(
89-
this IResourceBuilder<MinIOResource> builder,
90-
MinIOBuilder options) => builder
91-
.WithEnvironment("MINIO_ROOT_USER", options.AccessKey ?? "minioadmin")
92-
.WithEnvironment("MINIO_ROOT_PASSWORD", options.SecretKey ?? "minioadmin");
93-
94-
private static IResourceBuilder<MinIOResource> ConfigureVolume(
95-
this IResourceBuilder<MinIOResource> builder,
96-
MinIOBuilder options)
85+
extension(IResourceBuilder<MinIOResource> builder)
9786
{
98-
if (!string.IsNullOrEmpty(options.DataVolumePath))
99-
builder = builder.WithVolume(options.DataVolumePath, "/data");
100-
return builder;
87+
private IResourceBuilder<MinIOResource> ConfigureCredentials(MinIOBuilder options) => builder
88+
.WithEnvironment("MINIO_ROOT_USER", options.AccessKey ?? "minioadmin")
89+
.WithEnvironment("MINIO_ROOT_PASSWORD", options.SecretKey ?? "minioadmin");
90+
91+
IResourceBuilder<MinIOResource> ConfigureVolume(MinIOBuilder options)
92+
{
93+
if (!string.IsNullOrEmpty(options.DataVolumePath))
94+
builder = builder.WithVolume(options.DataVolumePath, "/data");
95+
return builder;
96+
}
10197
}
10298
}

‎src/GZCTF.Integration.Test/GZCTF.Integration.Test.csproj‎

Lines changed: 1 addition & 1 deletion
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
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<IsPackable>false</IsPackable>

‎src/GZCTF.Test/GZCTF.Test.csproj‎

Lines changed: 1 addition & 1 deletion
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
<Nullable>enable</Nullable>
55
<IsPackable>false</IsPackable>
66
<CollectCoverage>true</CollectCoverage>

‎src/GZCTF/ClientApp/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
"dependencies": {
1616
"@babel/core": "^7.28.5",
1717
"@emotion/react": "^11.14.0",
18-
"@mantine/carousel": "^8.3.8",
19-
"@mantine/colors-generator": "^8.3.8",
20-
"@mantine/core": "^8.3.8",
21-
"@mantine/dates": "^8.3.8",
22-
"@mantine/dropzone": "^8.3.8",
23-
"@mantine/emotion": "^8.3.8",
24-
"@mantine/form": "^8.3.8",
25-
"@mantine/hooks": "^8.3.8",
26-
"@mantine/modals": "^8.3.8",
27-
"@mantine/notifications": "^8.3.8",
18+
"@mantine/carousel": "^8.3.9",
19+
"@mantine/colors-generator": "^8.3.9",
20+
"@mantine/core": "^8.3.9",
21+
"@mantine/dates": "^8.3.9",
22+
"@mantine/dropzone": "^8.3.9",
23+
"@mantine/emotion": "^8.3.9",
24+
"@mantine/form": "^8.3.9",
25+
"@mantine/hooks": "^8.3.9",
26+
"@mantine/modals": "^8.3.9",
27+
"@mantine/notifications": "^8.3.9",
2828
"@marsidev/react-turnstile": "^1.3.1",
2929
"@mdi/js": "^7.4.47",
3030
"@mdi/react": "^1.6.1",
31-
"@microsoft/signalr": "^9.0.6",
31+
"@microsoft/signalr": "^10.0.0",
3232
"@shikijs/colorized-brackets": "^3.15.0",
3333
"@shikijs/langs": "^3.15.0",
3434
"@shikijs/themes": "^3.15.0",
@@ -43,18 +43,18 @@
4343
"embla-carousel-autoplay": "^8.6.0",
4444
"embla-carousel-react": "^8.6.0",
4545
"fast-average-color": "^9.5.0",
46-
"i18next": "^25.6.2",
46+
"i18next": "^25.6.3",
4747
"i18next-browser-languagedetector": "^8.2.0",
4848
"i18next-resources-to-backend": "^1.2.1",
4949
"katex": "^0.16.25",
5050
"lz-string": "^1.5.0",
51-
"marked": "^17.0.0",
51+
"marked": "^17.0.1",
5252
"pako": "^2.1.0",
5353
"pdfjs-dist": "5.4.296",
5454
"react": "^19.2.0",
5555
"react-dom": "^19.2.0",
5656
"react-error-boundary": "^6.0.0",
57-
"react-i18next": "^16.3.3",
57+
"react-i18next": "^16.3.5",
5858
"react-pdf": "^10.2.0",
5959
"react-router": "^7.9.6",
6060
"shiki": "^3.15.0",

0 commit comments

Comments
 (0)