Skip to content

Commit

Permalink
(#204) Upgrade .Net 8
Browse files Browse the repository at this point in the history
  • Loading branch information
phongnguyend committed Dec 15, 2023
1 parent 0859344 commit a2ebbe1
Show file tree
Hide file tree
Showing 128 changed files with 597 additions and 685 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/.net-build-microservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.101
dotnet-version: 8.0.100

- name: Build
run: dotnet build --configuration Release
Expand Down Expand Up @@ -61,58 +61,58 @@ jobs:
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.AuditLog.Api
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/bin/Release/net7.0/publish
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.AuditLog.Grpc
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.AuditLog.Grpc
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/bin/Release/net7.0/publish
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Identity.Api
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Identity.Api
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/bin/Release/net7.0/publish
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Identity.Grpc
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Identity.Grpc
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/bin/Release/net7.0/publish
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Notification.Api
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Notification.Api
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/bin/Release/net7.0/publish
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Notification.Background
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Notification.Background
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/bin/Release/net7.0/publish
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Notification.Grpc
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Notification.Grpc
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/bin/Release/net7.0/publish
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Product.Api
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Product.Api
path: src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/bin/Release/net7.0/publish
path: src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Services.Storage.Api
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Services.Storage.Api
path: src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/bin/Release/net7.0/publish
path: src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Gateways.WebAPI
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Gateways.WebAPI
path: src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/bin/Release/net7.0/publish
path: src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/bin/Release/net8.0/publish
8 changes: 4 additions & 4 deletions .github/workflows/.net-build-modularmonolith.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.101
dotnet-version: 8.0.100

- name: Build
run: dotnet build --configuration Release
Expand All @@ -40,16 +40,16 @@ jobs:
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.BackgroundServer
path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Migrator
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Migrator
path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.WebAPI
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.WebAPI
path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net8.0/publish
16 changes: 8 additions & 8 deletions .github/workflows/.net-build-monolith.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.101
dotnet-version: 8.0.100

- name: Build
run: dotnet build --configuration Release
Expand Down Expand Up @@ -52,40 +52,40 @@ jobs:
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.BackgroundServer
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.GraphQL
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.GraphQL
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.Migrator
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.Migrator
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.WebAPI
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.WebAPI
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.WebMVC
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.WebMVC
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.BlazorServerSide
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.BlazorServerSide
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net8.0/publish

- name: Upload ClassifiedAds.BlazorWebAssembly
uses: actions/upload-artifact@v1.0.0
with:
name: ClassifiedAds.BlazorWebAssembly
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net7.0/publish
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net8.0/publish
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AnalysisMode>Recommended</AnalysisMode>
<AnalysisModeSecurity>All</AnalysisModeSecurity>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AnalysisMode>Recommended</AnalysisMode>
<AnalysisModeSecurity>All</AnalysisModeSecurity>
</PropertyGroup>
Expand All @@ -11,7 +11,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="7.0.3" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AnalysisMode>Recommended</AnalysisMode>
<AnalysisModeSecurity>All</AnalysisModeSecurity>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.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="7.0.3" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<AnalysisMode>Recommended</AnalysisMode>
<AnalysisModeSecurity>All</AnalysisModeSecurity>
<UserSecretsId>aae914a2-80ef-4814-891a-8ed4e63c8c79</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.3.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.3.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /ClassifiedAds.IdentityServer

# Copy csproj and restore as distinct layers
Expand All @@ -17,7 +17,7 @@ COPY . ./
RUN dotnet publish ./ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj -c Release -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:7.0
FROM mcr.microsoft.com/dotnet/aspnet:8.0
WORKDIR /ClassifiedAds.IdentityServer
COPY --from=build-env /ClassifiedAds.IdentityServer/out .

Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AnalysisMode>Recommended</AnalysisMode>
<AnalysisModeSecurity>All</AnalysisModeSecurity>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<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.2" />
<PackageReference Include="Azure.Identity" Version="1.10.0" />
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.3.0" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="CryptographyHelper" Version="1.0.0" />
<PackageReference Include="Dapper.StrongName" Version="2.0.151" />
<PackageReference Include="IdentityModel" Version="6.1.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.10" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="6.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="CryptographyHelper" Version="2.0.0" />
<PackageReference Include="Dapper.StrongName" Version="2.1.24" />
<PackageReference Include="IdentityModel" Version="6.2.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.0" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.3.8" />
<PackageReference Include="MiniProfiler.Providers.SqlServer" Version="4.3.8" />
<PackageReference Include="Quartz" Version="3.7.0" />
<PackageReference Include="Quartz" Version="3.8.0" />
<PackageReference Include="SendGrid" Version="9.28.1" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Twilio" Version="6.11.0" />
<PackageReference Include="Twilio" Version="6.15.2" />
<PackageReference Include="VaultSharp" Version="1.13.0.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AnalysisMode>Recommended</AnalysisMode>
<AnalysisModeSecurity>All</AnalysisModeSecurity>
<UserSecretsId>b8df572d-5be2-4f41-b55a-8f4e2ef2b569</UserSecretsId>
Expand All @@ -21,13 +21,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="dbup" Version="5.0.8" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="dbup" Version="5.0.37" />
<PackageReference Include="Polly" Version="8.2.0" />
<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="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/IdentityServer/Duende/ClassifiedAds.Migrator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /ClassifiedAds.Monolith

# Copy csproj and restore as distinct layers
Expand Down Expand Up @@ -29,7 +29,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:8.0
WORKDIR /ClassifiedAds.Monolith
COPY --from=build-env /ClassifiedAds.Monolith/out .

Expand Down

0 comments on commit a2ebbe1

Please sign in to comment.