Skip to content

Commit c444f31

Browse files
ntxinhntxinh
committed
feat: migrate to net 10
1 parent cfa9a72 commit c444f31

21 files changed

Lines changed: 318 additions & 240 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,3 +434,6 @@ $RECYCLE.BIN/
434434
!.vscode/extensions.json
435435

436436
Src/DDD.CLI.Migration/App.config
437+
438+
Src/DDD.Services.Api/Logs
439+
Src/DDD.Services.Api/app.db

‎DDD.sln‎

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

‎DDD.slnx‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path=".editorconfig" />
4+
<File Path=".gitignore" />
5+
<File Path="Directory.Build.props" />
6+
<File Path="Directory.Packages.props" />
7+
<File Path="global.json" />
8+
<File Path="README.md" />
9+
</Folder>
10+
<Folder Name="/Src/">
11+
<Project Path="Src/DDD.Application/DDD.Application.csproj" />
12+
<Project Path="Src/DDD.CLI.Migration/DDD.CLI.Migration.csproj" />
13+
<Project Path="Src/DDD.Domain/DDD.Domain.csproj" />
14+
<Project Path="Src/DDD.Domain.Core/DDD.Domain.Core.csproj" />
15+
<Project Path="Src/DDD.Infra.CrossCutting.Bus/DDD.Infra.CrossCutting.Bus.csproj" />
16+
<Project Path="Src/DDD.Infra.CrossCutting.Identity/DDD.Infra.CrossCutting.Identity.csproj" />
17+
<Project Path="Src/DDD.Infra.CrossCutting.IoC/DDD.Infra.CrossCutting.IoC.csproj" />
18+
<Project Path="Src/DDD.Infra.Data/DDD.Infra.Data.csproj" />
19+
<Project Path="Src/DDD.Services.Api/DDD.Services.Api.csproj" />
20+
</Folder>
21+
<Folder Name="/Tests/">
22+
<Project Path="Tests/DDD.Application.UnitTests/DDD.Application.UnitTests.csproj" />
23+
<Project Path="Tests/DDD.Services.Api.IntegrationTests/DDD.Services.Api.IntegrationTests.csproj" />
24+
</Folder>
25+
</Solution>

‎Directory.Packages.props‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<!-- <AspireVersion>9.5.2</AspireVersion> -->
5+
<AspnetVersion>10.0.0</AspnetVersion>
6+
<EfcoreVersion>10.0.0</EfcoreVersion>
7+
<MicrosoftExtensionsVersion>10.0.0</MicrosoftExtensionsVersion>
48
</PropertyGroup>
59
<ItemGroup>
610
<PackageVersion Include="NPOI" Version="2.7.5" />
711
<PackageVersion Include="Quartz.AspNetCore" Version="3.15.1" />
812
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
9-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
10-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
11-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EfcoreVersion)" />
14+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EfcoreVersion)" />
15+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EfcoreVersion)" />
16+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfcoreVersion)" />
1217
<!-- AutoMapper 14.0.0 or Earlier (MIT License) -->
1318
<PackageVersion Include="AutoMapper" Version="14.0.0" />
1419
<!-- MediatR 12.2.0 or Earlier (Apache 2.0 License) -->
@@ -21,12 +26,13 @@
2126
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
2227
<PackageVersion Include="Asp.Versioning.Http" Version="8.1.0" />
2328
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
24-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.0" />
25-
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="10.0.0" />
26-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
29+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="$(EfcoreVersion)" />
30+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsVersion)" />
2731
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
28-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
32+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspnetVersion)" />
2933
<!-- <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" /> -->
34+
<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
35+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
3036

3137
<PackageVersion Include="dbup" Version="5.0.41" />
3238
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
@@ -38,13 +44,13 @@
3844
<PackageVersion Include="xunit" Version="2.9.3" />
3945
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
4046

41-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
42-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
47+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspnetVersion)" />
48+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspnetVersion)" />
4349
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
4450

4551
<!-- FluentAssertions 6.12.0 or Earlier (Apache 2.0 License) -->
4652
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
47-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
53+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspnetVersion)" />
4854
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
4955
</ItemGroup>
5056
</Project>

‎Src/DDD.Domain.Core/DDD.Domain.Core.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
<ItemGroup>
4-
<PackageReference Include="FluentValidation.AspNetCore" />
4+
<PackageReference Include="FluentValidation" />
55
<PackageReference Include="MediatR" />
66
</ItemGroup>
77

‎Src/DDD.Domain/DDD.Domain.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<ProjectReference Include="..\DDD.Infra.CrossCutting.Bus\DDD.Infra.CrossCutting.Bus.csproj" />
66
</ItemGroup>
77

8+
<ItemGroup>
9+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
10+
</ItemGroup>
11+
812
<ItemGroup>
913
<PackageReference Include="NPOI" />
1014
<PackageReference Include="Quartz.AspNetCore" />

‎Src/DDD.Infra.CrossCutting.Identity/DDD.Infra.CrossCutting.Identity.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
66
<PackageReference Include="Microsoft.EntityFrameworkCore" />
77
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
89
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
910
</ItemGroup>
1011

‎Src/DDD.Infra.Data/DDD.Infra.Data.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ItemGroup>
44
<PackageReference Include="Microsoft.EntityFrameworkCore" />
55
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
6+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
67
</ItemGroup>
78

89
<ItemGroup>

‎Src/DDD.Services.Api/Configurations/AddRequiredHeaderParameter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.OpenApi.Models;
1+
/* using Microsoft.OpenApi;
22
33
using Swashbuckle.AspNetCore.SwaggerGen;
44
@@ -16,3 +16,4 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
1616
});
1717
}
1818
}
19+
*/

‎Src/DDD.Services.Api/Controllers/v1/AccountController.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using Asp.Versioning;
2+
13
using System.IdentityModel.Tokens.Jwt;
24
using System.Security.Claims;
35

0 commit comments

Comments
 (0)