(#153) Upgrade .Net 7

phongnguyend · Dec 17, 2022 · 0c2102e · 0c2102e
1 parent 7c3476a
commit 0c2102e
Show file tree

Hide file tree

Showing 62 changed files with 312 additions and 396 deletions.
diff --git a/.github/workflows/.net-build-modularmonolith.yml b/.github/workflows/.net-build-modularmonolith.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.101
 
     - name: Build
       run: dotnet build --configuration Release 
@@ -40,16 +40,16 @@ jobs:
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.BackgroundServer
-        path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net6.0/publish
+        path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.Migrator
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.Migrator
-        path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net6.0/publish
+        path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.WebAPI
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.WebAPI
-        path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net6.0/publish
+        path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
diff --git a/.github/workflows/.net-build-monolith.yml b/.github/workflows/.net-build-monolith.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.101
 
     - name: Build
       run: dotnet build --configuration Release 
@@ -52,40 +52,40 @@ jobs:
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.BackgroundServer
-        path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.GraphQL
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.GraphQL
-        path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.Migrator
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.Migrator
-        path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.WebAPI
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.WebAPI
-        path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.WebMVC
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.WebMVC
-        path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.BlazorServerSide
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.BlazorServerSide
-        path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net7.0/publish
 
     - name: Upload ClassifiedAds.BlazorWebAssembly
       uses: actions/[email protected]
       with:
         name: ClassifiedAds.BlazorWebAssembly
-        path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net6.0/publish
+        path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net7.0/publish
diff --git a/src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj b/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>ClassifiedAds.BackgroundServer</AssemblyName>
     <RootNamespace>ClassifiedAds.BackgroundServer</RootNamespace>
     <UserSecretsId>b924d88d-1033-40eb-80bd-48272839dd65</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile b/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
 WORKDIR /ClassifiedAds.ModularMonolith
 
 # Copy csproj and restore as distinct layers
@@ -32,7 +32,7 @@ COPY . ./
 RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 WORKDIR /ClassifiedAds.ModularMonolith
 COPY --from=build-env /ClassifiedAds.ModularMonolith/out .
 

diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json b/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json
@@ -73,12 +73,12 @@
   "Modules": {
     "AuditLog": {
       "ConnectionStrings": {
-        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
+        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
       }
     },
     "Notification": {
       "ConnectionStrings": {
-        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
+        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
       },
       "Email": {
         "Provider": "SmtpClient",
@@ -122,12 +122,12 @@
     },
     "Product": {
       "ConnectionStrings": {
-        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
+        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
       }
     },
     "Storage": {
       "ConnectionStrings": {
-        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
+        "Default": "Server=127.0.0.1;Database=ClassifiedAds.ModularMonolith.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
       },
       "Provider": "Local",
       "Local": {

diff --git a/...ularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/...ularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<RootNamespace>ClassifiedAds.CrossCuttingConcerns</RootNamespace>
 	</PropertyGroup>
 
@@ -10,7 +10,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Text.Json" Version="6.0.0" />
+		<PackageReference Include="System.Text.Json" Version="7.0.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-		<PackageReference Include="System.Text.Json" Version="6.0.0" />
+		<PackageReference Include="System.Text.Json" Version="7.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
@@ -1,67 +1,68 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>ClassifiedAds.Infrastructure</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.4.9" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.101.39" />
     <PackageReference Include="Azure.Communication.Sms" Version="1.0.1" />
     <PackageReference Include="Azure.Data.AppConfiguration" Version="1.2.0" />
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.1" />
-    <PackageReference Include="Azure.Identity" Version="1.5.0" />
-    <PackageReference Include="Azure.Messaging.EventGrid" Version="4.7.0" />
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.6.2" />
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.6.2" />
-    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.5.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.8.0" />
-    <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="Confluent.Kafka" Version="1.8.2" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
+    <PackageReference Include="Azure.Identity" Version="1.8.0" />
+    <PackageReference Include="Azure.Messaging.EventGrid" Version="4.12.0" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.7.5" />
+    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.7.5" />
+    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.11.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
+    <PackageReference Include="Castle.Core" Version="5.1.0" />
+    <PackageReference Include="Confluent.Kafka" Version="1.9.3" />
     <PackageReference Include="CryptographyHelper" Version="1.0.0" />
-    <PackageReference Include="CsvHelper" Version="27.2.0" />
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="Dapper.StrongName" Version="2.0.123" />
     <PackageReference Include="DinkToPdf" Version="1.0.8" />
     <PackageReference Include="EntityFrameworkCore.SqlServer.SimpleBulks" Version="6.5.0" />
-    <PackageReference Include="IdentityModel" Version="5.2.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="4.5.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="IdentityModel" Version="6.0.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="5.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="7.0.0" />
     <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
     <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
     <PackageReference Include="MiniProfiler.Providers.SqlServer" Version="4.2.22" />
-    <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.2.0-beta2.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.2.0-beta2.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.2.0-beta2.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.3.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.3.1" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc8" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc8" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc8" />
-    <PackageReference Include="PuppeteerSharp" Version="6.0.0" />
-    <PackageReference Include="Quartz" Version="3.3.3" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
-    <PackageReference Include="RazorLight" Version="2.0.0-rc.3" />
-    <PackageReference Include="SendGrid" Version="9.25.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
+    <PackageReference Include="PuppeteerSharp" Version="8.0.0" />
+    <PackageReference Include="Quartz" Version="3.5.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
+    <PackageReference Include="RazorLight" Version="2.3.0" />
+    <PackageReference Include="SendGrid" Version="9.28.1" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.0.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Twilio" Version="5.68.1" />
-    <PackageReference Include="VaultSharp" Version="1.7.1" />
+    <PackageReference Include="Twilio" Version="6.2.0" />
+    <PackageReference Include="VaultSharp" Version="1.12.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj b/src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>4be179d7-2665-482a-95cd-f35f0620143a</UserSecretsId>
   </PropertyGroup>
 
@@ -19,13 +19,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="dbup" Version="4.5.0" />
-    <PackageReference Include="Polly" Version="7.2.2" />
+    <PackageReference Include="dbup" Version="5.0.8" />
+    <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/ModularMonolith/ClassifiedAds.Migrator/Dockerfile b/src/ModularMonolith/ClassifiedAds.Migrator/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
 WORKDIR /ClassifiedAds.ModularMonolith
 
 # Copy csproj and restore as distinct layers
@@ -32,7 +32,7 @@ COPY . ./
 RUN dotnet publish ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 WORKDIR /ClassifiedAds.ModularMonolith
 COPY --from=build-env /ClassifiedAds.ModularMonolith/out .