Skip to content

Commit 8803329

Browse files
skrasekmichaelskrasekmichael
authored
Upgrade to NET 9 (#58)
- upgrade to NET 9 - upgrade libraries - remove FluentAssertions.Web and use custom extension methods instead - namespace and formatting fixes
1 parent 5c39a9f commit 8803329

File tree

49 files changed

+241
-252
lines changed

Some content is hidden

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

49 files changed

+241
-252
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ insert_final_newline = true
3333
[*.{cs,vb}]
3434

3535
# Organize usings
36-
dotnet_separate_import_directive_groups = true
36+
dotnet_separate_import_directive_groups = false
3737
dotnet_sort_system_directives_first = true
3838
file_header_template = unset
3939

@@ -194,6 +194,7 @@ csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental
194194
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
195195
csharp_style_prefer_extended_property_pattern = true:suggestion
196196
csharp_style_prefer_primary_constructors = false:suggestion
197+
csharp_prefer_system_threading_lock = true:suggestion
197198

198199
#### Naming styles ####
199200
[*.{cs,vb}]

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup .NET
2626
uses: actions/setup-dotnet@v3
2727
with:
28-
dotnet-version: 8.0.x
28+
dotnet-version: 9.0.x
2929

3030
- name: Restore
3131
run: dotnet restore ${{ env.SOLUTION }}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

‎Directory.Packages.props‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,42 @@
55
<ItemGroup>
66
<PackageVersion Include="Asp.Versioning.Http" Version="8.1.0" />
77
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
8-
<PackageVersion Include="Bogus" Version="35.5.0" />
9-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
10-
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.31.0" />
11-
<PackageVersion Include="FluentAssertions.Web" Version="1.3.0" />
12-
<PackageVersion Include="FluentValidation" Version="11.9.1" />
13-
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.1" />
14-
<PackageVersion Include="MailKit" Version="4.5.0" />
15-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
16-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
17-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
18-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4" />
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
22-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.4" />
23-
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.4" />
24-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
25-
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
26-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
27-
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
28-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
29-
<PackageVersion Include="MediatR" Version="12.2.0" />
8+
<PackageVersion Include="Bogus" Version="35.6.3" />
9+
<PackageVersion Include="FluentAssertions" Version="8.2.0" />
10+
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
11+
<PackageVersion Include="FluentValidation" Version="12.0.0" />
12+
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
13+
<PackageVersion Include="MailKit" Version="4.12.0" />
14+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
16+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
20+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.4" />
21+
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.4" />
22+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
23+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
24+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
25+
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.9.0" />
26+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
27+
<PackageVersion Include="MediatR" Version="12.5.0" />
3028
<PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
31-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
32-
<PackageVersion Include="Quartz" Version="3.8.1" />
33-
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.1" />
29+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
30+
<PackageVersion Include="Quartz" Version="3.14.0" />
31+
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.14.0" />
3432
<PackageVersion Include="Respawn" Version="6.2.1" />
35-
<PackageVersion Include="Riok.Mapperly" Version="3.5.1" />
36-
<PackageVersion Include="Skrasek.RailwayResult" Version="1.1.0" />
37-
<PackageVersion Include="Skrasek.RailwayResult.Errors" Version="1.1.0" />
38-
<PackageVersion Include="Skrasek.RailwayResult.FunctionalExtensions" Version="1.1.0" />
39-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
40-
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
41-
<PackageVersion Include="Testcontainers" Version="3.8.0" />
42-
<PackageVersion Include="Testcontainers.PostgreSql" Version="3.8.0" />
43-
<PackageVersion Include="xunit" Version="2.7.1" />
44-
<PackageVersion Include="xunit.extensibility.core" Version="2.7.1" />
45-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.8" />
46-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
33+
<PackageVersion Include="Riok.Mapperly" Version="4.2.1" />
34+
<PackageVersion Include="Skrasek.RailwayResult" Version="1.2.0" />
35+
<PackageVersion Include="Skrasek.RailwayResult.Errors" Version="1.2.0" />
36+
<PackageVersion Include="Skrasek.RailwayResult.FunctionalExtensions" Version="1.2.0" />
37+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
38+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.9.0" />
39+
<PackageVersion Include="Testcontainers" Version="4.4.0" />
40+
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.4.0" />
41+
<PackageVersion Include="xunit" Version="2.9.3" />
42+
<PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
43+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
44+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
4745
</ItemGroup>
4846
</Project>

‎src/TeamUp.Api/Endpoints/Teams/ChangeNicknameEndpoint.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using MediatR;
2-
32
using Microsoft.AspNetCore.Mvc;
4-
53
using TeamUp.Api.Extensions;
6-
using TeamUp.Application.Teams.SetMemberNickname;
4+
using TeamUp.Application.Teams.ChangeNickname;
75
using TeamUp.Contracts.Teams;
86

97
namespace TeamUp.Api.Endpoints.Teams;

‎src/TeamUp.Api/Filters/ValidationFilter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using FluentValidation;
22
using FluentValidation.Results;
3-
43
using TeamUp.Contracts.Abstractions;
54

65
namespace TeamUp.Api.Filters;
76

8-
public class ValidationFilter : IEndpointFilter
7+
public sealed class ValidationFilter : IEndpointFilter
98
{
109
private readonly IServiceProvider _services;
1110
private readonly ILogger<ValidationFilter> _logger;

‎src/TeamUp.Application/Teams/ChangeNickname/ChangeNicknameCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
using TeamUp.Contracts.Teams;
33
using TeamUp.Contracts.Users;
44

5-
namespace TeamUp.Application.Teams.SetMemberNickname;
5+
namespace TeamUp.Application.Teams.ChangeNickname;
66

77
public sealed record ChangeNicknameCommand(UserId InitiatorId, TeamId TeamId, string Nickname) : ICommand<Result>;

‎src/TeamUp.Application/Teams/ChangeNickname/ChangeNicknameCommandHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using TeamUp.Domain.Abstractions;
33
using TeamUp.Domain.Aggregates.Teams;
44

5-
namespace TeamUp.Application.Teams.SetMemberNickname;
5+
namespace TeamUp.Application.Teams.ChangeNickname;
66

77
internal sealed class ChangeNicknameCommandHandler : ICommandHandler<ChangeNicknameCommand, Result>
88
{

src/TeamUp.Application/Users/CompleteRegistration/CompleteRegistrationCommand Handler.cs renamed to src/TeamUp.Application/Users/CompleteRegistration/CompleteRegistrationCommandHandler.cs

File renamed without changes.

‎src/TeamUp.Application/Users/CompleteRegistration/UserGeneratedEventHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using TeamUp.Domain.Abstractions;
33
using TeamUp.Domain.Aggregates.Users.IntegrationEvents;
44

5-
namespace TeamUp.Application.Users.Register;
5+
namespace TeamUp.Application.Users.CompleteRegistration;
66

77
internal sealed class UserGeneratedEventHandler : IIntegrationEventHandler<UserGeneratedEvent>
88
{

0 commit comments

Comments
 (0)