Skip to content

Commit 29ca85d

Browse files
ntxinhntxinh
authored
Merge pull request #55 from ntxinh/migrate-to-net10
Migrate to net10
2 parents 41a35a3 + c444f31 commit 29ca85d

28 files changed

Lines changed: 359 additions & 278 deletions

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [workflow_dispatch]
44

55
env:
66
WEBAPP_PACKAGE_PATH: './published'
7-
# NETCORE_VERSION: '8.0.0'
7+
# NETCORE_VERSION: '10.0.0'
88
# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
99

1010
jobs:

‎.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

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "watch",
12-
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net8.0/DDD.Services.Api.dll",
12+
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net10.0/DDD.Services.Api.dll",
1313
"args": [],
1414
"cwd": "${workspaceFolder}/Src/DDD.Services.Api",
1515
"stopAtEntry": false,
@@ -24,7 +24,7 @@
2424
"type": "coreclr",
2525
"request": "launch",
2626
"preLaunchTask": "build",
27-
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net8.0/DDD.Services.Api.dll",
27+
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net10.0/DDD.Services.Api.dll",
2828
"args": [],
2929
"cwd": "${workspaceFolder}/Src/DDD.Services.Api",
3030
"stopAtEntry": false,
@@ -39,7 +39,7 @@
3939
"type": "coreclr",
4040
"request": "launch",
4141
"preLaunchTask": "build",
42-
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net8.0/DDD.Services.Api.dll",
42+
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net10.0/DDD.Services.Api.dll",
4343
"args": [],
4444
"cwd": "${workspaceFolder}/Src/DDD.Services.Api",
4545
"stopAtEntry": false,
@@ -54,7 +54,7 @@
5454
"type": "coreclr",
5555
"request": "launch",
5656
"preLaunchTask": "build",
57-
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net8.0/DDD.Services.Api.dll",
57+
"program": "${workspaceFolder}/Src/DDD.Services.Api/bin/Debug/net10.0/DDD.Services.Api.dll",
5858
"args": [],
5959
"cwd": "${workspaceFolder}/Src/DDD.Services.Api",
6060
"stopAtEntry": false,

‎Containerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# .NET Core SDK
2-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
2+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
33

44
# Sets the working directory
55
WORKDIR /app
@@ -27,7 +27,7 @@ COPY Src ./Src
2727
RUN dotnet publish ./Src/DDD.Services.Api/DDD.Services.Api.csproj -c Release -o /publish
2828

2929
# ASP.NET Core Runtime
30-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
30+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
3131
WORKDIR /app
3232
COPY --from=build /publish ./
3333

‎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.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>net10.0</TargetFramework>
44
<!-- <Nullable>enable</Nullable> -->
55
<ImplicitUsings>enable</ImplicitUsings>
66
<InvariantGlobalization>true</InvariantGlobalization>

‎Directory.Packages.props‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
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>
6-
<PackageVersion Include="NPOI" Version="2.6.2" />
7-
<PackageVersion Include="Quartz.AspNetCore" Version="3.7.0" />
8-
<PackageVersion Include="Refit.HttpClientFactory" Version="6.0.38" />
9-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
10-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5" />
11-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
12-
<PackageVersion Include="AutoMapper" Version="12.0.1" />
10+
<PackageVersion Include="NPOI" Version="2.7.5" />
11+
<PackageVersion Include="Quartz.AspNetCore" Version="3.15.1" />
12+
<PackageVersion Include="Refit.HttpClientFactory" Version="8.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)" />
17+
<!-- AutoMapper 14.0.0 or Earlier (MIT License) -->
18+
<PackageVersion Include="AutoMapper" Version="14.0.0" />
19+
<!-- MediatR 12.2.0 or Earlier (Apache 2.0 License) -->
1320
<PackageVersion Include="MediatR" Version="12.2.0" />
14-
<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
15-
<!-- <PackageVersion Include="FluentValidation" Version="11.9.0" />
16-
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" /> -->
17-
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
18-
<PackageVersion Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
19-
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
20-
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
21-
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
22-
<PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
23-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
24-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
25-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.0" />
26-
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
27-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.4.0" />
21+
<PackageVersion Include="FluentValidation" Version="12.1.0" />
22+
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.0" />
23+
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
24+
<PackageVersion Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
25+
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
26+
<PackageVersion Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
27+
<PackageVersion Include="Asp.Versioning.Http" Version="8.1.0" />
28+
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
29+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="$(EfcoreVersion)" />
30+
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsVersion)" />
2831
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
29-
<!-- <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" /> -->
32+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspnetVersion)" />
33+
<!-- <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" />
3136

32-
<PackageVersion Include="dbup" Version="4.6.0" />
33-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
37+
<PackageVersion Include="dbup" Version="5.0.41" />
38+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
3439

3540
<!-- Test -->
36-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
37-
<PackageVersion Include="Moq" Version="4.16.1" />
38-
<PackageVersion Include="xunit" Version="2.4.1" />
39-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
41+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
42+
<!-- Moq 4.20.70 or Earlier (BSD 3-Clause License) -->
43+
<PackageVersion Include="Moq" Version="4.20.70" />
44+
<PackageVersion Include="xunit" Version="2.9.3" />
45+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
4046

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

45-
<PackageVersion Include="FluentAssertions" Version="5.10.3" />
46-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.5" />
47-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
51+
<!-- FluentAssertions 6.12.0 or Earlier (Apache 2.0 License) -->
52+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
53+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspnetVersion)" />
54+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
4855
</ItemGroup>
4956
</Project>

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# .NET Core SDK
2-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
2+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
33

44
# Sets the working directory
55
WORKDIR /app
@@ -27,7 +27,7 @@ COPY Src ./Src
2727
RUN dotnet publish ./Src/DDD.Services.Api/DDD.Services.Api.csproj -c Release -o /publish
2828

2929
# ASP.NET Core Runtime
30-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
30+
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
3131
WORKDIR /app
3232
COPY --from=build /publish ./
3333

0 commit comments

Comments
 (0)