Skip to content

Commit 0c2102e

Browse files
phongnguyendphongnguyend
committed
(#153) Upgrade .Net 7
1 parent 7c3476a commit 0c2102e

File tree

62 files changed

+312
-396
lines changed

Some content is hidden

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

62 files changed

+312
-396
lines changed

‎.github/workflows/.net-build-modularmonolith.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET Core
2323
uses: actions/setup-dotnet@v1
2424
with:
25-
dotnet-version: 6.0.100
25+
dotnet-version: 7.0.101
2626

2727
- name: Build
2828
run: dotnet build --configuration Release
@@ -40,16 +40,16 @@ jobs:
4040
uses: actions/[email protected]
4141
with:
4242
name: ClassifiedAds.BackgroundServer
43-
path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net6.0/publish
43+
path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
4444

4545
- name: Upload ClassifiedAds.Migrator
4646
uses: actions/[email protected]
4747
with:
4848
name: ClassifiedAds.Migrator
49-
path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net6.0/publish
49+
path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
5050

5151
- name: Upload ClassifiedAds.WebAPI
5252
uses: actions/[email protected]
5353
with:
5454
name: ClassifiedAds.WebAPI
55-
path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net6.0/publish
55+
path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish

‎.github/workflows/.net-build-monolith.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET Core
2323
uses: actions/setup-dotnet@v1
2424
with:
25-
dotnet-version: 6.0.100
25+
dotnet-version: 7.0.101
2626

2727
- name: Build
2828
run: dotnet build --configuration Release
@@ -52,40 +52,40 @@ jobs:
5252
uses: actions/[email protected]
5353
with:
5454
name: ClassifiedAds.BackgroundServer
55-
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net6.0/publish
55+
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
5656

5757
- name: Upload ClassifiedAds.GraphQL
5858
uses: actions/[email protected]
5959
with:
6060
name: ClassifiedAds.GraphQL
61-
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net6.0/publish
61+
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net7.0/publish
6262

6363
- name: Upload ClassifiedAds.Migrator
6464
uses: actions/[email protected]
6565
with:
6666
name: ClassifiedAds.Migrator
67-
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net6.0/publish
67+
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
6868

6969
- name: Upload ClassifiedAds.WebAPI
7070
uses: actions/[email protected]
7171
with:
7272
name: ClassifiedAds.WebAPI
73-
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net6.0/publish
73+
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
7474

7575
- name: Upload ClassifiedAds.WebMVC
7676
uses: actions/[email protected]
7777
with:
7878
name: ClassifiedAds.WebMVC
79-
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net6.0/publish
79+
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net7.0/publish
8080

8181
- name: Upload ClassifiedAds.BlazorServerSide
8282
uses: actions/[email protected]
8383
with:
8484
name: ClassifiedAds.BlazorServerSide
85-
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net6.0/publish
85+
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net7.0/publish
8686

8787
- name: Upload ClassifiedAds.BlazorWebAssembly
8888
uses: actions/[email protected]
8989
with:
9090
name: ClassifiedAds.BlazorWebAssembly
91-
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net6.0/publish
91+
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net7.0/publish

‎src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
1010
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>ClassifiedAds.BackgroundServer</AssemblyName>
66
<RootNamespace>ClassifiedAds.BackgroundServer</RootNamespace>
77
<UserSecretsId>b924d88d-1033-40eb-80bd-48272839dd65</UserSecretsId>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
1313
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
22
WORKDIR /ClassifiedAds.ModularMonolith
33

44
# Copy csproj and restore as distinct layers
@@ -32,7 +32,7 @@ COPY . ./
3232
RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -c Release -o out
3333

3434
# Build runtime image
35-
FROM mcr.microsoft.com/dotnet/aspnet:6.0
35+
FROM mcr.microsoft.com/dotnet/aspnet:7.0
3636
WORKDIR /ClassifiedAds.ModularMonolith
3737
COPY --from=build-env /ClassifiedAds.ModularMonolith/out .
3838

‎src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
"Modules": {
7474
"AuditLog": {
7575
"ConnectionStrings": {
76-
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
76+
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
7777
}
7878
},
7979
"Notification": {
8080
"ConnectionStrings": {
81-
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
81+
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
8282
},
8383
"Email": {
8484
"Provider": "SmtpClient",
@@ -122,12 +122,12 @@
122122
},
123123
"Product": {
124124
"ConnectionStrings": {
125-
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
125+
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
126126
}
127127
},
128128
"Storage": {
129129
"ConnectionStrings": {
130-
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
130+
"Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
131131
},
132132
"Provider": "Local",
133133
"Local": {

‎src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<RootNamespace>ClassifiedAds.CrossCuttingConcerns</RootNamespace>
66
</PropertyGroup>
77

@@ -10,7 +10,7 @@
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="System.Text.Json" Version="6.0.0" />
13+
<PackageReference Include="System.Text.Json" Version="7.0.1" />
1414
</ItemGroup>
1515

1616
</Project>

‎src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
99
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
1010
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
15-
<PackageReference Include="System.Text.Json" Version="6.0.0" />
15+
<PackageReference Include="System.Text.Json" Version="7.0.1" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,68 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<RootNamespace>ClassifiedAds.Infrastructure</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<FrameworkReference Include="Microsoft.AspNetCore.App" />
10-
<PackageReference Include="AWSSDK.S3" Version="3.7.4.9" />
10+
<PackageReference Include="AWSSDK.S3" Version="3.7.101.39" />
1111
<PackageReference Include="Azure.Communication.Sms" Version="1.0.1" />
1212
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.2.0" />
13-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.1" />
14-
<PackageReference Include="Azure.Identity" Version="1.5.0" />
15-
<PackageReference Include="Azure.Messaging.EventGrid" Version="4.7.0" />
16-
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.6.2" />
17-
<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.6.2" />
18-
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.5.0" />
19-
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
20-
<PackageReference Include="Azure.Storage.Queues" Version="12.8.0" />
21-
<PackageReference Include="Castle.Core" Version="4.4.1" />
22-
<PackageReference Include="Confluent.Kafka" Version="1.8.2" />
13+
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
14+
<PackageReference Include="Azure.Identity" Version="1.8.0" />
15+
<PackageReference Include="Azure.Messaging.EventGrid" Version="4.12.0" />
16+
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.7.5" />
17+
<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.7.5" />
18+
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.11.1" />
19+
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
20+
<PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
21+
<PackageReference Include="Castle.Core" Version="5.1.0" />
22+
<PackageReference Include="Confluent.Kafka" Version="1.9.3" />
2323
<PackageReference Include="CryptographyHelper" Version="1.0.0" />
24-
<PackageReference Include="CsvHelper" Version="27.2.0" />
24+
<PackageReference Include="CsvHelper" Version="30.0.1" />
2525
<PackageReference Include="Dapper.StrongName" Version="2.0.123" />
2626
<PackageReference Include="DinkToPdf" Version="1.0.8" />
2727
<PackageReference Include="EntityFrameworkCore.SqlServer.SimpleBulks" Version="6.5.0" />
28-
<PackageReference Include="IdentityModel" Version="5.2.0" />
29-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
30-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
31-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.0" />
32-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.0" />
33-
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="4.5.1" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
28+
<PackageReference Include="IdentityModel" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.1" />
31+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.1" />
32+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.1" />
33+
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="5.2.0" />
34+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
3536
<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
36-
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="6.0.0" />
37-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
38-
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="6.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.1" />
38+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.1" />
40+
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="7.0.0" />
4041
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
4142
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
4243
<PackageReference Include="MiniProfiler.Providers.SqlServer" Version="4.2.22" />
43-
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.2.0-beta2.1" />
44-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.2.0-beta2.1" />
45-
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.2.0-beta2.1" />
44+
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.3.1" />
45+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
46+
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.3.1" />
4647
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc8" />
4748
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc8" />
4849
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc8" />
49-
<PackageReference Include="PuppeteerSharp" Version="6.0.0" />
50-
<PackageReference Include="Quartz" Version="3.3.3" />
51-
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
52-
<PackageReference Include="RazorLight" Version="2.0.0-rc.3" />
53-
<PackageReference Include="SendGrid" Version="9.25.0" />
54-
<PackageReference Include="Serilog" Version="2.10.0" />
55-
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
50+
<PackageReference Include="PuppeteerSharp" Version="8.0.0" />
51+
<PackageReference Include="Quartz" Version="3.5.0" />
52+
<PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
53+
<PackageReference Include="RazorLight" Version="2.3.0" />
54+
<PackageReference Include="SendGrid" Version="9.28.1" />
55+
<PackageReference Include="Serilog" Version="2.12.0" />
56+
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
5657
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
57-
<PackageReference Include="Serilog.Exceptions" Version="8.0.0" />
58+
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
5859
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
5960
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
6061
<PrivateAssets>all</PrivateAssets>
6162
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6263
</PackageReference>
63-
<PackageReference Include="Twilio" Version="5.68.1" />
64-
<PackageReference Include="VaultSharp" Version="1.7.1" />
64+
<PackageReference Include="Twilio" Version="6.2.0" />
65+
<PackageReference Include="VaultSharp" Version="1.12.2" />
6566
</ItemGroup>
6667

6768
<ItemGroup>

‎src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<UserSecretsId>4be179d7-2665-482a-95cd-f35f0620143a</UserSecretsId>
66
</PropertyGroup>
77

@@ -19,13 +19,13 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="dbup" Version="4.5.0" />
23-
<PackageReference Include="Polly" Version="7.2.2" />
22+
<PackageReference Include="dbup" Version="5.0.8" />
23+
<PackageReference Include="Polly" Version="7.2.3" />
2424
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>

0 commit comments

Comments
 (0)