Skip to content

Commit 2a8ae07

Browse files
authored
⬆️ Upgrade project dependencies to .NET 10 and related packages (#584)
* ⬆️ Upgrade project dependencies to .NET 10 and related packages * ♻️ Remove commented-out PackageReference for HealthChecks in Infrastructure.csproj * ♻️ Update Directory.Build.props to adjust code analysis warnings * ♻️ Add KubernetesClient package reference with a TODO for dependency update
1 parent d033a51 commit 2a8ae07

5 files changed

Lines changed: 26 additions & 21 deletions

File tree

Directory.Build.props

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<TreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</TreatWarningsAsErrors>
77
<CodeAnalysisTreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</CodeAnalysisTreatWarningsAsErrors>
88

99
<AnalysisLevel>latest</AnalysisLevel>
1010
<AnalysisMode>Recommended</AnalysisMode>
11-
11+
1212
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1313

1414
<!-- Disable whitespace rule -->
@@ -17,5 +17,8 @@
1717
<!-- Disable "must have curly braces for if/else" -->
1818
<NoWarn>$(NoWarn);IDE0011</NoWarn>
1919

20-
</PropertyGroup>
20+
<!-- Disable "auto property warning" TODO: Remove after fields are introduced -->
21+
<NoWarn>$(NoWarn);IDE0032</NoWarn>
22+
23+
</PropertyGroup>
2124
</Project>

Directory.Packages.props

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,25 @@
2525
<PackageVersion Include="ErrorOr" Version="2.0.1" />
2626
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
2727
<PackageVersion Include="JunitXml.TestLogger" Version="4.1.0" />
28+
<!-- TODO: Remove when Aspire updates KubernetesClient dependency to fix https://github.com/advisories/GHSA-w7r3-mgwf-4mqq -->
29+
<PackageVersion Include="KubernetesClient" Version="17.0.14" />
2830
<PackageVersion Include="MediatR" Version="13.0.0" />
2931
<PackageVersion Include="MediatR.Contracts" Version="2.0.1" />
30-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
31-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
32-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
33-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
32+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1"/>
33+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1"/>
34+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1"/>
35+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
3436
<PrivateAssets>all</PrivateAssets>
3537
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3638
</PackageVersion>
37-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
38-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.11" />
39-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.11" />
40-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.11" />
41-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
42-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.11" />
43-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0" />
44-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
39+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1"/>
40+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.1"/>
41+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1"/>
42+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1"/>
43+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0"/>
44+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1"/>
45+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0"/>
46+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0"/>
4547
<PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
4648
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4749
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.0" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.200",
3+
"version": "10.0.100",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

src/Infrastructure/Infrastructure.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<RootNamespace>SSW.CleanArchitecture.Infrastructure</RootNamespace>
44
<AssemblyName>SSW.CleanArchitecture.Infrastructure</AssemblyName>
@@ -14,9 +14,10 @@
1414

1515
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer"/>
1616
<PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" />
17+
<!-- TODO: Remove when Aspire updates KubernetesClient dependency to fix https://github.com/advisories/GHSA-w7r3-mgwf-4mqq -->
18+
<PackageReference Include="KubernetesClient" />
1719

18-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
19-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
20+
<PackageReference Include="Microsoft.Extensions.Http.Resilience"/>
2021
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery"/>
2122
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
2223
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />

src/WebApi/Extensions/WebApplicationExt.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ public static RouteGroupBuilder MapApiGroup(this WebApplication app, string grou
99
{
1010
var group = app
1111
.MapGroup($"api/{groupName}")
12-
.WithTags(groupName)
13-
.WithOpenApi();
12+
.WithTags(groupName);
1413

1514
return group;
1615
}

0 commit comments

Comments
 (0)