From a2ebbe1b48a403bfebbebc06a228b427087110e9 Mon Sep 17 00:00:00 2001 From: Phong Nguyen Date: Fri, 15 Dec 2023 16:22:09 +0700 Subject: [PATCH] (#204) Upgrade .Net 8 --- .../workflows/.net-build-microservices.yml | 22 ++-- .../workflows/.net-build-modularmonolith.yml | 8 +- .github/workflows/.net-build-monolith.yml | 16 +-- .../ClassifiedAds.Application.csproj | 6 +- .../ClassifiedAds.CrossCuttingConcerns.csproj | 4 +- .../ClassifiedAds.Domain.csproj | 6 +- .../ClassifiedAds.IdentityServer.csproj | 14 +-- .../ClassifiedAds.IdentityServer/Dockerfile | 4 +- .../ClassifiedAds.Infrastructure.csproj | 44 ++++---- .../ClassifiedAds.Migrator.csproj | 8 +- .../Duende/ClassifiedAds.Migrator/Dockerfile | 4 +- .../ClassifiedAds.Persistence.csproj | 12 +-- .../ClassifiedAds.Application.csproj | 6 +- .../ClassifiedAds.CrossCuttingConcerns.csproj | 4 +- .../ClassifiedAds.Domain.csproj | 6 +- .../ClassifiedAds.IdentityServer.csproj | 14 +-- .../ClassifiedAds.IdentityServer/Dockerfile | 4 +- .../appsettings.json | 4 +- .../ClassifiedAds.Infrastructure.csproj | 58 +++++----- .../ClassifiedAds.Migrator.csproj | 9 +- .../ClassifiedAds.Migrator/Dockerfile | 4 +- .../ClassifiedAds.Migrator/appsettings.json | 4 +- .../ClassifiedAds.Persistence.csproj | 12 +-- .../ClassifiedAds.Application.csproj | 6 +- .../ClassifiedAds.CrossCuttingConcerns.csproj | 4 +- .../ClassifiedAds.Domain.csproj | 6 +- .../ClassifiedAds.Infrastructure.csproj | 100 +++++++++--------- .../Logging/LoggingExtensions.cs | 2 - .../OpenTelemetry/OpenTelemetryExtensions.cs | 13 +-- .../OpenTelemetry/OpenTelemetryOptions.cs | 11 -- .../ClassifiedAds.Gateways.GraphQL.csproj | 2 +- .../ClassifiedAds.Gateways.WebAPI.csproj | 8 +- .../ClassifiedAds.Gateways.WebAPI/Dockerfile | 4 +- src/Microservices/README.md | 2 +- ...ClassifiedAds.Services.AuditLog.Api.csproj | 8 +- .../Dockerfile | 4 +- .../appsettings.json | 2 +- ...lassifiedAds.Services.AuditLog.Grpc.csproj | 6 +- .../Dockerfile | 4 +- .../ClassifiedAds.Services.AuditLog.csproj | 12 +-- ...ifiedAds.Services.Configuration.Api.csproj | 18 ++-- .../Dockerfile | 4 +- ...ClassifiedAds.Services.Identity.Api.csproj | 6 +- .../Dockerfile | 4 +- ...lassifiedAds.Services.Identity.Grpc.csproj | 4 +- .../Dockerfile | 4 +- ....Services.Identity.IntegrationTests.csproj | 12 +-- .../ClassifiedAds.Services.Identity.csproj | 16 +-- ...sifiedAds.Services.Notification.Api.csproj | 6 +- .../Dockerfile | 4 +- ...ds.Services.Notification.Background.csproj | 6 +- .../Dockerfile | 4 +- ...ifiedAds.Services.Notification.Grpc.csproj | 4 +- .../Dockerfile | 4 +- ...ClassifiedAds.Services.Notification.csproj | 10 +- .../ClassifiedAds.Services.Product.Api.csproj | 22 ++-- .../Dockerfile | 4 +- .../appsettings.json | 2 +- .../ClassifiedAds.Services.Storage.Api.csproj | 16 +-- .../Dockerfile | 4 +- .../appsettings.json | 2 +- src/Microservices/docker-compose.yml | 26 ++--- .../ClassifiedAds.Application.csproj | 6 +- .../ClassifiedAds.BackgroundServer.csproj | 6 +- .../ClassifiedAds.BackgroundServer/Dockerfile | 4 +- .../appsettings.json | 2 +- .../ClassifiedAds.Contracts.csproj | 2 +- .../ClassifiedAds.CrossCuttingConcerns.csproj | 4 +- .../ClassifiedAds.Domain.csproj | 6 +- .../ClassifiedAds.Infrastructure.csproj | 98 +++++++++-------- .../Logging/LoggingExtensions.cs | 2 - .../OpenTelemetry/OpenTelemetryExtensions.cs | 13 +-- .../OpenTelemetry/OpenTelemetryOptions.cs | 11 -- .../ClassifiedAds.Migrator.csproj | 8 +- .../ClassifiedAds.Migrator/Dockerfile | 4 +- .../ClassifiedAds.Modules.AuditLog.csproj | 2 +- ...ClassifiedAds.Modules.Configuration.csproj | 6 +- .../ClassifiedAds.Modules.Identity.csproj | 6 +- .../ClassifiedAds.Modules.Notification.csproj | 2 +- ...edAds.Modules.Product.EndToEndTests.csproj | 10 +- ...ds.Modules.Product.IntegrationTests.csproj | 10 +- ...sifiedAds.Modules.Product.UnitTests.csproj | 10 +- .../ClassifiedAds.Modules.Product.csproj | 2 +- .../ClassifiedAds.Modules.Storage.csproj | 2 +- .../ClassifiedAds.WebAPI.csproj | 8 +- .../ClassifiedAds.WebAPI/Dockerfile | 4 +- .../ClassifiedAds.WebAPI/appsettings.json | 2 +- src/ModularMonolith/README.md | 2 +- src/ModularMonolith/docker-compose.yml | 8 +- src/Monolith/.env | 3 +- .../ClassifiedAds.Application.csproj | 6 +- .../Users/Commands/SyncUsersCommand.cs | 1 - .../ClassifiedAds.ArchTests.csproj | 10 +- .../ClassifiedAds.BackgroundServer.csproj | 6 +- .../ClassifiedAds.BackgroundServer/Dockerfile | 4 +- .../appsettings.json | 2 +- .../ClassifiedAds.Blazor.Modules.csproj | 12 +-- .../ClassifiedAds.BlazorServerSide.csproj | 14 +-- .../ClassifiedAds.BlazorServerSide/Dockerfile | 4 +- .../ClassifiedAds.BlazorWebAssembly.csproj | 10 +- .../ClassifiedAds.ContractTests.csproj | 14 +-- .../ClassifiedAds.CrossCuttingConcerns.csproj | 4 +- .../ClassifiedAds.Domain.csproj | 6 +- .../IAuth0IdentityProvider.cs | 4 +- ...AzureActiveDirectoryB2CIdentityProvider.cs | 4 +- .../IdentityProviders/IIdentityProvider.cs | 2 +- .../IdentityProviders/IUser.cs | 2 +- .../ClassifiedAds.EndToEndTests.csproj | 16 +-- .../ClassifiedAds.GraphQL.csproj | 4 +- src/Monolith/ClassifiedAds.GraphQL/Dockerfile | 4 +- .../ClassifiedAds.Infrastructure.csproj | 100 +++++++++--------- .../Logging/LoggingExtensions.cs | 2 - .../OpenTelemetry/OpenTelemetryExtensions.cs | 13 +-- .../OpenTelemetry/OpenTelemetryOptions.cs | 11 -- .../ClassifiedAds.IntegrationTests.csproj | 28 ++--- .../appsettings.json | 2 +- .../ClassifiedAds.Migrator.csproj | 8 +- .../ClassifiedAds.Migrator/Dockerfile | 4 +- .../ClassifiedAds.Persistence.csproj | 12 +-- .../ClassifiedAds.UnitTests.csproj | 14 +-- .../ClassifiedAds.WebAPI.csproj | 8 +- src/Monolith/ClassifiedAds.WebAPI/Dockerfile | 4 +- .../ClassifiedAds.WebAPI/appsettings.json | 2 +- .../ClassifiedAds.WebMVC.csproj | 26 ++--- src/Monolith/ClassifiedAds.WebMVC/Dockerfile | 4 +- .../ClassifiedAds.WebMVC/appsettings.json | 4 +- src/Monolith/README.md | 2 +- src/Monolith/docker-compose.yml | 17 ++- 128 files changed, 597 insertions(+), 685 deletions(-) diff --git a/.github/workflows/.net-build-microservices.yml b/.github/workflows/.net-build-microservices.yml index dd0172731..414ad7492 100644 --- a/.github/workflows/.net-build-microservices.yml +++ b/.github/workflows/.net-build-microservices.yml @@ -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 @@ -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 diff --git a/.github/workflows/.net-build-modularmonolith.yml b/.github/workflows/.net-build-modularmonolith.yml index f9d49cffd..e5d8b6ac2 100644 --- 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: 7.0.101 + dotnet-version: 8.0.100 - name: Build run: dotnet build --configuration Release @@ -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 diff --git a/.github/workflows/.net-build-monolith.yml b/.github/workflows/.net-build-monolith.yml index f41cce9c8..c211f384c 100644 --- 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: 7.0.101 + dotnet-version: 8.0.100 - name: Build run: dotnet build --configuration Release @@ -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 diff --git a/src/IdentityServer/Duende/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/IdentityServer/Duende/ClassifiedAds.Application/ClassifiedAds.Application.csproj index 204801301..f7f888237 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.Application/ClassifiedAds.Application.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.Application/ClassifiedAds.Application.csproj @@ -1,14 +1,14 @@  - net7.0 + net8.0 Recommended All - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Duende/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/src/IdentityServer/Duende/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj index 2ce81bc31..913aedb8d 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/IdentityServer/Duende/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/IdentityServer/Duende/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj index 8fd4a5656..4641cebe6 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj @@ -1,20 +1,20 @@  - net7.0 + net8.0 Recommended All - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj b/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj index 6b00b12c6..d1d21f407 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable Recommended All @@ -9,12 +9,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/Dockerfile b/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/Dockerfile index bdb076a02..6c1171ee0 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/Dockerfile +++ b/src/IdentityServer/Duende/ClassifiedAds.IdentityServer/Dockerfile @@ -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 @@ -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 . diff --git a/src/IdentityServer/Duende/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/IdentityServer/Duende/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj index 908d2d2c8..3cbae3be8 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All @@ -9,39 +9,39 @@ - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/IdentityServer/Duende/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj b/src/IdentityServer/Duende/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj index 738d84e0d..34282ff7a 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All b8df572d-5be2-4f41-b55a-8f4e2ef2b569 @@ -21,13 +21,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/Duende/ClassifiedAds.Migrator/Dockerfile b/src/IdentityServer/Duende/ClassifiedAds.Migrator/Dockerfile index 5b048b6b3..9adae3410 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.Migrator/Dockerfile +++ b/src/IdentityServer/Duende/ClassifiedAds.Migrator/Dockerfile @@ -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 @@ -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 . diff --git a/src/IdentityServer/Duende/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj b/src/IdentityServer/Duende/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj index 343058400..1af110178 100644 --- a/src/IdentityServer/Duende/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj +++ b/src/IdentityServer/Duende/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj @@ -1,17 +1,17 @@  - net7.0 + net8.0 Recommended All - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj index 954c4bb8a..f7f888237 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 Recommended All - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj index 70a4f36ff..913aedb8d 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Recommended All @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj index 74cf72bdd..4641cebe6 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj @@ -1,20 +1,20 @@  - net6.0 + net8.0 Recommended All - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj index bdec00b6f..542dc0e31 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj @@ -1,19 +1,19 @@  - net6.0 + net8.0 Recommended All aae914a2-80ef-4814-891a-8ed4e63c8c79 - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile index e35734819..110b2181a 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile @@ -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.IdentityServer # Copy csproj and restore as distinct layers @@ -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:6.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 WORKDIR /ClassifiedAds.IdentityServer COPY --from=build-env /ClassifiedAds.IdentityServer/out . diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json index 55779529d..84272d1c0 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { - "ClassifiedAds": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true", - "IdentityServer": "Server=127.0.0.1;Database=ClassifiedAds.IdentityServer.OpenIddict;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true" + "ClassifiedAds": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False", + "IdentityServer": "Server=127.0.0.1;Database=ClassifiedAds.IdentityServer.OpenIddict;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False" }, "IdentityServer": { "IssuerUri": "", diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj index e4fe0d384..50eedf8b4 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Recommended All @@ -9,39 +9,39 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj index 7fc063217..34282ff7a 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Recommended All b8df572d-5be2-4f41-b55a-8f4e2ef2b569 @@ -13,7 +13,6 @@ - @@ -22,13 +21,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile index 5b048b6b3..9adae3410 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile @@ -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 @@ -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 . diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/appsettings.json b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/appsettings.json index 23d028a43..d8cee678d 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/appsettings.json +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/appsettings.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { - "ClassifiedAds": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true", - "IdentityServer": "Server=127.0.0.1;Database=ClassifiedAds.IdentityServer.OpenIddict;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true" + "ClassifiedAds": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False", + "IdentityServer": "Server=127.0.0.1;Database=ClassifiedAds.IdentityServer.OpenIddict;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False" }, "CheckDependency": { "Enabled": false, diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj index c7a949177..a01f30922 100644 --- a/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj +++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj @@ -1,18 +1,18 @@  - net6.0 + net8.0 Recommended All - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microservices/Common/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/Microservices/Common/ClassifiedAds.Application/ClassifiedAds.Application.csproj index 3778219be..a4db53708 100644 --- a/src/Microservices/Common/ClassifiedAds.Application/ClassifiedAds.Application.csproj +++ b/src/Microservices/Common/ClassifiedAds.Application/ClassifiedAds.Application.csproj @@ -1,12 +1,12 @@ - net7.0 + net8.0 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj index c92455636..881ce0e4c 100644 --- a/src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj +++ b/src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 ClassifiedAds.CrossCuttingConcerns @@ -10,7 +10,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj index c0357af71..03c316641 100644 --- a/src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj +++ b/src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj @@ -1,18 +1,18 @@  - net7.0 + net8.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj index 81bdf585d..60b972cf6 100644 --- a/src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj +++ b/src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj @@ -1,74 +1,70 @@  - net7.0 + net8.0 ClassifiedAds.Infrastructure - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs index c59c2176f..50fe9e30c 100644 --- a/src/Microservices/Common/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs +++ b/src/Microservices/Common/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs @@ -32,7 +32,6 @@ private static void UseClassifiedAdsLogger(this IWebHostEnvironment env, Logging loggerConfiguration = loggerConfiguration .MinimumLevel.Debug() .Enrich.FromLogContext() - .Enrich.With() .Enrich.WithMachineName() .Enrich.WithEnvironmentUserName() .Enrich.WithProperty("ProcessId", Environment.ProcessId) @@ -249,7 +248,6 @@ private static void UseClassifiedAdsLogger(this IHostEnvironment env, LoggingOpt loggerConfiguration = loggerConfiguration .MinimumLevel.Debug() .Enrich.FromLogContext() - .Enrich.With() .Enrich.WithMachineName() .Enrich.WithEnvironmentUserName() .Enrich.WithProperty("ProcessId", Environment.ProcessId) diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs index 008bb7121..6fd2960e0 100644 --- a/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs +++ b/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OpenTelemetry; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -35,15 +34,6 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl .AddEntityFrameworkCoreInstrumentation() .AddHttpClientInstrumentation(); - if (options?.Jaeger?.IsEnabled ?? false) - { - builder.AddJaegerExporter(jaegerOptions => - { - jaegerOptions.AgentHost = options.Jaeger.AgentHost; - jaegerOptions.AgentPort = options.Jaeger.AgentPort; - }); - } - if (options?.Zipkin?.IsEnabled ?? false) { builder.AddZipkinExporter(zipkinOptions => @@ -75,8 +65,7 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl otlpOptions.Endpoint = new Uri(options.Otlp.Endpoint); }); } - }) - .StartWithHost(); + }); return services; } diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs index 47ea4889e..27ee0c97b 100644 --- a/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs +++ b/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs @@ -8,8 +8,6 @@ public class OpenTelemetryOptions public ZipkinOptions Zipkin { get; set; } - public JaegerOptions Jaeger { get; set; } - public OtlpOptions Otlp { get; set; } } @@ -20,15 +18,6 @@ public class ZipkinOptions public string Endpoint { get; set; } } -public class JaegerOptions -{ - public bool IsEnabled { get; set; } - - public string AgentHost { get; set; } - - public int AgentPort { get; set; } -} - public class OtlpOptions { public bool IsEnabled { get; set; } diff --git a/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL.csproj b/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL.csproj index 75f5c76e8..a866af01f 100644 --- a/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL.csproj +++ b/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 diff --git a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI.csproj b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI.csproj index 492ac21af..64cffad1b 100644 --- a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI.csproj +++ b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI.csproj @@ -1,14 +1,14 @@  - net7.0 + net8.0 4a8b7447-cb04-4631-8420-8ac41700e230 - - - + + + diff --git a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Dockerfile b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Dockerfile index 1d12ffe2b..871f116d4 100644 --- a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Dockerfile +++ b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -17,7 +17,7 @@ COPY . ./ RUN dotnet publish ./Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/README.md b/src/Microservices/README.md index d3ca670f3..9d11a9e78 100644 --- a/src/Microservices/README.md +++ b/src/Microservices/README.md @@ -142,7 +142,7 @@ - Build ``` - docker-compose build + docker compose build ``` - Tag diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/ClassifiedAds.Services.AuditLog.Api.csproj b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/ClassifiedAds.Services.AuditLog.Api.csproj index 8b7136915..7a90ae94b 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/ClassifiedAds.Services.AuditLog.Api.csproj +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/ClassifiedAds.Services.AuditLog.Api.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 c0d90214-b332-43c7-baa7-9a7ebf96ae71 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Dockerfile b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Dockerfile index ea3dd5771..ed53ac37c 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Dockerfile +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/ClassifiedAds.Services.AuditLog.Api.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.json b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.json index 0eea14a68..b00a67cfa 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.json +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.json @@ -26,7 +26,7 @@ }, "AllowedHosts": "*", "MessageBroker": { - "Provider": "Fake", + "Provider": "RabbitMQ", "RabbitMQ": { "HostName": "localhost", "UserName": "guest", diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/ClassifiedAds.Services.AuditLog.Grpc.csproj b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/ClassifiedAds.Services.AuditLog.Grpc.csproj index 1b1d7326c..1c8a5e3bf 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/ClassifiedAds.Services.AuditLog.Grpc.csproj +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/ClassifiedAds.Services.AuditLog.Grpc.csproj @@ -1,16 +1,16 @@  - net7.0 + net8.0 c0d90214-b332-43c7-baa7-9a7ebf96ae71 - + - + diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Dockerfile b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Dockerfile index 2850631e2..2bdb46849 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Dockerfile +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/ClassifiedAds.Services.AuditLog.Grpc.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog/ClassifiedAds.Services.AuditLog.csproj b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog/ClassifiedAds.Services.AuditLog.csproj index 6ae7096b0..7dcaadba6 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog/ClassifiedAds.Services.AuditLog.csproj +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog/ClassifiedAds.Services.AuditLog.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/ClassifiedAds.Services.Configuration.Api.csproj b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/ClassifiedAds.Services.Configuration.Api.csproj index c205e6711..91f10943b 100644 --- a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/ClassifiedAds.Services.Configuration.Api.csproj +++ b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/ClassifiedAds.Services.Configuration.Api.csproj @@ -1,27 +1,27 @@  - net7.0 + net8.0 - - + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Dockerfile b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Dockerfile index 73499a068..5453e26e6 100644 --- a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Dockerfile +++ b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -17,7 +17,7 @@ COPY . ./ RUN dotnet publish ./Services.Configuration/ClassifiedAds.Services.Configuration.Api/ClassifiedAds.Services.Configuration.Api.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/ClassifiedAds.Services.Identity.Api.csproj b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/ClassifiedAds.Services.Identity.Api.csproj index 217cb3a1e..258998a63 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/ClassifiedAds.Services.Identity.Api.csproj +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/ClassifiedAds.Services.Identity.Api.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 37e169d5-ecb0-4b12-acf3-07a624b9c6c9 - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Dockerfile b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Dockerfile index d4b6727c6..b88deaf8d 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Dockerfile +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.Identity/ClassifiedAds.Services.Identity.Api/ClassifiedAds.Services.Identity.Api.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/ClassifiedAds.Services.Identity.Grpc.csproj b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/ClassifiedAds.Services.Identity.Grpc.csproj index 5475c03e5..456bc016a 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/ClassifiedAds.Services.Identity.Grpc.csproj +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/ClassifiedAds.Services.Identity.Grpc.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Dockerfile b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Dockerfile index 48f5fa3e9..85ec6a5a3 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Dockerfile +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.Identity/ClassifiedAds.Services.Identity.Grpc/ClassifiedAds.Services.Identity.Grpc.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.IntegrationTests/ClassifiedAds.Services.Identity.IntegrationTests.csproj b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.IntegrationTests/ClassifiedAds.Services.Identity.IntegrationTests.csproj index 688e14ec0..779d8c226 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.IntegrationTests/ClassifiedAds.Services.Identity.IntegrationTests.csproj +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.IntegrationTests/ClassifiedAds.Services.Identity.IntegrationTests.csproj @@ -1,23 +1,23 @@  - net7.0 + net8.0 false - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity/ClassifiedAds.Services.Identity.csproj b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity/ClassifiedAds.Services.Identity.csproj index af1a096fe..4ffe0def8 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity/ClassifiedAds.Services.Identity.csproj +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity/ClassifiedAds.Services.Identity.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -9,16 +9,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/ClassifiedAds.Services.Notification.Api.csproj b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/ClassifiedAds.Services.Notification.Api.csproj index 5eadd4680..ce98561f0 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/ClassifiedAds.Services.Notification.Api.csproj +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/ClassifiedAds.Services.Notification.Api.csproj @@ -1,12 +1,12 @@  - net7.0 + net8.0 3bb18abd-09c2-44f2-900e-28cc944866e1 - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -14,7 +14,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Dockerfile b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Dockerfile index d842430b3..605118cb3 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Dockerfile +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.Notification/ClassifiedAds.Services.Notification.Api/ClassifiedAds.Services.Notification.Api.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/ClassifiedAds.Services.Notification.Background.csproj b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/ClassifiedAds.Services.Notification.Background.csproj index 5aa49dfa3..f2247cc44 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/ClassifiedAds.Services.Notification.Background.csproj +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/ClassifiedAds.Services.Notification.Background.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 3bb18abd-09c2-44f2-900e-28cc944866e1 - - + + diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Dockerfile b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Dockerfile index 6101837ce..78b225fb9 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Dockerfile +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.Notification/ClassifiedAds.Services.Notification.Background/ClassifiedAds.Services.Notification.Background.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/ClassifiedAds.Services.Notification.Grpc.csproj b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/ClassifiedAds.Services.Notification.Grpc.csproj index 4e81d228b..0dfc99af0 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/ClassifiedAds.Services.Notification.Grpc.csproj +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/ClassifiedAds.Services.Notification.Grpc.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 3bb18abd-09c2-44f2-900e-28cc944866e1 @@ -11,7 +11,7 @@ - + diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/Dockerfile b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/Dockerfile index b7fdd55cf..a39302196 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/Dockerfile +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -20,7 +20,7 @@ COPY . ./ RUN dotnet publish ./Services.Notification/ClassifiedAds.Services.Notification.Grpc/ClassifiedAds.Services.Notification.Grpc.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification/ClassifiedAds.Services.Notification.csproj b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification/ClassifiedAds.Services.Notification.csproj index d42257ad9..19f1f77f0 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification/ClassifiedAds.Services.Notification.csproj +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification/ClassifiedAds.Services.Notification.csproj @@ -1,15 +1,15 @@  - net7.0 + net8.0 enable - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/ClassifiedAds.Services.Product.Api.csproj b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/ClassifiedAds.Services.Product.Api.csproj index 66adbcee3..950beb313 100644 --- a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/ClassifiedAds.Services.Product.Api.csproj +++ b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/ClassifiedAds.Services.Product.Api.csproj @@ -1,34 +1,34 @@  - net7.0 + net8.0 0de8f61d-276a-4df2-a419-89d3cbb127ff - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Dockerfile b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Dockerfile index a11a696c9..aff3daf0a 100644 --- a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Dockerfile +++ b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -17,7 +17,7 @@ COPY . ./ RUN dotnet publish ./Services.Product/ClassifiedAds.Services.Product.Api/ClassifiedAds.Services.Product.Api.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.json b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.json index 3fdad8c37..81458409d 100644 --- a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.json +++ b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.json @@ -26,7 +26,7 @@ }, "AllowedHosts": "*", "MessageBroker": { - "Provider": "Fake", + "Provider": "RabbitMQ", "RabbitMQ": { "HostName": "localhost", "UserName": "guest", diff --git a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/ClassifiedAds.Services.Storage.Api.csproj b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/ClassifiedAds.Services.Storage.Api.csproj index ba9102d9f..eb7cec13a 100644 --- a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/ClassifiedAds.Services.Storage.Api.csproj +++ b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/ClassifiedAds.Services.Storage.Api.csproj @@ -1,30 +1,30 @@  - net7.0 + net8.0 f2e298d9-f756-4769-92a2-d920b7e1a422 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Dockerfile b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Dockerfile index cc92833ba..0223dab7c 100644 --- a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Dockerfile +++ b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Dockerfile @@ -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.Microservices # Copy csproj and restore as distinct layers @@ -17,7 +17,7 @@ COPY . ./ RUN dotnet publish ./Services.Storage/ClassifiedAds.Services.Storage.Api/ClassifiedAds.Services.Storage.Api.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.Microservices COPY --from=build-env /ClassifiedAds.Microservices/out . diff --git a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.json b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.json index 793faa141..7b7142a80 100644 --- a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.json +++ b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.json @@ -33,7 +33,7 @@ } }, "MessageBroker": { - "Provider": "Fake", + "Provider": "RabbitMQ", "RabbitMQ": { "HostName": "localhost", "UserName": "guest", diff --git a/src/Microservices/docker-compose.yml b/src/Microservices/docker-compose.yml index 9bc3d902a..2a979e3c2 100644 --- a/src/Microservices/docker-compose.yml +++ b/src/Microservices/docker-compose.yml @@ -209,22 +209,22 @@ services: context: . dockerfile: ./Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Dockerfile ports: - - "9002:80" + - "9002:8080" depends_on: - db environment: ASPNETCORE_ENVIRONMENT: ${ASPNETCORE_ENVIRONMENT} ProxyProvider: "Ocelot" Ocelot__DefaultDownstreamScheme: "http" - Ocelot__Routes__Products__Downstream: "http://product-api" - Ocelot__Routes__Files__Downstream: "http://storage-api" - Ocelot__Routes__AuditLogs__Downstream: "http://auditlog-api" - Ocelot__Routes__Users__Downstream: "http://identity-api" - Ocelot__Routes__Configurations__Downstream: "http://configuration-api" - Ocelot__Routes__Hubs__Downstream: "ws://notification-api" - Yarp__Clusters__Products__Destinations__destination1__Address: "http://product-api" - Yarp__Clusters__Files__Destinations__destination1__Address: "http://storage-api" - Yarp__Clusters__AuditLogs__Destinations__destination1__Address: "http://auditlog-api" - Yarp__Clusters__Users__Destinations__destination1__Address: "http://identity-api" - Yarp__Clusters__Configurations__Destinations__destination1__Address: "http://configuration-api" - Yarp__Clusters__Hubs__Destinations__destination1__Address: "http://notification-api" + Ocelot__Routes__Products__Downstream: "http://product-api:8080" + Ocelot__Routes__Files__Downstream: "http://storage-api:8080" + Ocelot__Routes__AuditLogs__Downstream: "http://auditlog-api:8080" + Ocelot__Routes__Users__Downstream: "http://identity-api:8080" + Ocelot__Routes__Configurations__Downstream: "http://configuration-api:8080" + Ocelot__Routes__Hubs__Downstream: "ws://notification-api:8080" + Yarp__Clusters__Products__Destinations__destination1__Address: "http://product-api:8080" + Yarp__Clusters__Files__Destinations__destination1__Address: "http://storage-api:8080" + Yarp__Clusters__AuditLogs__Destinations__destination1__Address: "http://auditlog-api:8080" + Yarp__Clusters__Users__Destinations__destination1__Address: "http://identity-api:8080" + Yarp__Clusters__Configurations__Destinations__destination1__Address: "http://configuration-api:8080" + Yarp__Clusters__Hubs__Destinations__destination1__Address: "http://notification-api:8080" diff --git a/src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj index 3778219be..a4db53708 100644 --- a/src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj +++ b/src/ModularMonolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj @@ -1,12 +1,12 @@ - net7.0 + net8.0 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj b/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj index b6ce41188..4cfdbf1c6 100644 --- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj +++ b/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj @@ -1,15 +1,15 @@  - net7.0 + net8.0 ClassifiedAds.BackgroundServer ClassifiedAds.BackgroundServer b924d88d-1033-40eb-80bd-48272839dd65 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile b/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile index dda2fa680..75de729e3 100644 --- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile +++ b/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile @@ -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.ModularMonolith # Copy csproj and restore as distinct layers @@ -30,7 +30,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.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.ModularMonolith COPY --from=build-env /ClassifiedAds.ModularMonolith/out . diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json b/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json index 238b3be7d..d2673a926 100644 --- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json +++ b/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json @@ -6,7 +6,7 @@ }, "AllowedHosts": "*", "MessageBroker": { - "Provider": "Fake", + "Provider": "RabbitMQ", "RabbitMQ": { "HostName": "localhost", "UserName": "guest", diff --git a/src/ModularMonolith/ClassifiedAds.Contracts/ClassifiedAds.Contracts.csproj b/src/ModularMonolith/ClassifiedAds.Contracts/ClassifiedAds.Contracts.csproj index 13467980c..bab0ebfac 100644 --- a/src/ModularMonolith/ClassifiedAds.Contracts/ClassifiedAds.Contracts.csproj +++ b/src/ModularMonolith/ClassifiedAds.Contracts/ClassifiedAds.Contracts.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable diff --git a/src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj index c92455636..881ce0e4c 100644 --- a/src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj +++ b/src/ModularMonolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 ClassifiedAds.CrossCuttingConcerns @@ -10,7 +10,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj index c0357af71..03c316641 100644 --- a/src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj +++ b/src/ModularMonolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj @@ -1,18 +1,18 @@  - net7.0 + net8.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj index a46792517..60b972cf6 100644 --- a/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj +++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj @@ -1,72 +1,70 @@  - net7.0 + net8.0 ClassifiedAds.Infrastructure - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs index c59c2176f..50fe9e30c 100644 --- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs +++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs @@ -32,7 +32,6 @@ private static void UseClassifiedAdsLogger(this IWebHostEnvironment env, Logging loggerConfiguration = loggerConfiguration .MinimumLevel.Debug() .Enrich.FromLogContext() - .Enrich.With() .Enrich.WithMachineName() .Enrich.WithEnvironmentUserName() .Enrich.WithProperty("ProcessId", Environment.ProcessId) @@ -249,7 +248,6 @@ private static void UseClassifiedAdsLogger(this IHostEnvironment env, LoggingOpt loggerConfiguration = loggerConfiguration .MinimumLevel.Debug() .Enrich.FromLogContext() - .Enrich.With() .Enrich.WithMachineName() .Enrich.WithEnvironmentUserName() .Enrich.WithProperty("ProcessId", Environment.ProcessId) diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs index 008bb7121..6fd2960e0 100644 --- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs +++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OpenTelemetry; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -35,15 +34,6 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl .AddEntityFrameworkCoreInstrumentation() .AddHttpClientInstrumentation(); - if (options?.Jaeger?.IsEnabled ?? false) - { - builder.AddJaegerExporter(jaegerOptions => - { - jaegerOptions.AgentHost = options.Jaeger.AgentHost; - jaegerOptions.AgentPort = options.Jaeger.AgentPort; - }); - } - if (options?.Zipkin?.IsEnabled ?? false) { builder.AddZipkinExporter(zipkinOptions => @@ -75,8 +65,7 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl otlpOptions.Endpoint = new Uri(options.Otlp.Endpoint); }); } - }) - .StartWithHost(); + }); return services; } diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs index 47ea4889e..27ee0c97b 100644 --- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs +++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs @@ -8,8 +8,6 @@ public class OpenTelemetryOptions public ZipkinOptions Zipkin { get; set; } - public JaegerOptions Jaeger { get; set; } - public OtlpOptions Otlp { get; set; } } @@ -20,15 +18,6 @@ public class ZipkinOptions public string Endpoint { get; set; } } -public class JaegerOptions -{ - public bool IsEnabled { get; set; } - - public string AgentHost { get; set; } - - public int AgentPort { get; set; } -} - public class OtlpOptions { public bool IsEnabled { get; set; } diff --git a/src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj b/src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj index f8f48a4db..35adf0c2f 100644 --- a/src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj +++ b/src/ModularMonolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 4be179d7-2665-482a-95cd-f35f0620143a @@ -19,13 +19,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.Migrator/Dockerfile b/src/ModularMonolith/ClassifiedAds.Migrator/Dockerfile index b3e622260..6a7549ccf 100644 --- a/src/ModularMonolith/ClassifiedAds.Migrator/Dockerfile +++ b/src/ModularMonolith/ClassifiedAds.Migrator/Dockerfile @@ -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.ModularMonolith # Copy csproj and restore as distinct layers @@ -30,7 +30,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.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.ModularMonolith COPY --from=build-env /ClassifiedAds.ModularMonolith/out . diff --git a/src/ModularMonolith/ClassifiedAds.Modules.AuditLog/ClassifiedAds.Modules.AuditLog.csproj b/src/ModularMonolith/ClassifiedAds.Modules.AuditLog/ClassifiedAds.Modules.AuditLog.csproj index 53241e455..44c2bbf23 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.AuditLog/ClassifiedAds.Modules.AuditLog.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.AuditLog/ClassifiedAds.Modules.AuditLog.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Configuration/ClassifiedAds.Modules.Configuration.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Configuration/ClassifiedAds.Modules.Configuration.csproj index beeff86ce..69a544c10 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Configuration/ClassifiedAds.Modules.Configuration.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Configuration/ClassifiedAds.Modules.Configuration.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 - - + + all diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Identity/ClassifiedAds.Modules.Identity.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Identity/ClassifiedAds.Modules.Identity.csproj index 6c6452392..bd6d1bc12 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Identity/ClassifiedAds.Modules.Identity.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Identity/ClassifiedAds.Modules.Identity.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Notification/ClassifiedAds.Modules.Notification.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Notification/ClassifiedAds.Modules.Notification.csproj index 53241e455..44c2bbf23 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Notification/ClassifiedAds.Modules.Notification.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Notification/ClassifiedAds.Modules.Notification.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Product.EndToEndTests/ClassifiedAds.Modules.Product.EndToEndTests.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Product.EndToEndTests/ClassifiedAds.Modules.Product.EndToEndTests.csproj index 44cb1bcfc..6be11550a 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Product.EndToEndTests/ClassifiedAds.Modules.Product.EndToEndTests.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Product.EndToEndTests/ClassifiedAds.Modules.Product.EndToEndTests.csproj @@ -1,19 +1,19 @@  - net7.0 + net8.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Product.IntegrationTests/ClassifiedAds.Modules.Product.IntegrationTests.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Product.IntegrationTests/ClassifiedAds.Modules.Product.IntegrationTests.csproj index 44cb1bcfc..6be11550a 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Product.IntegrationTests/ClassifiedAds.Modules.Product.IntegrationTests.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Product.IntegrationTests/ClassifiedAds.Modules.Product.IntegrationTests.csproj @@ -1,19 +1,19 @@  - net7.0 + net8.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Product.UnitTests/ClassifiedAds.Modules.Product.UnitTests.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Product.UnitTests/ClassifiedAds.Modules.Product.UnitTests.csproj index 44cb1bcfc..6be11550a 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Product.UnitTests/ClassifiedAds.Modules.Product.UnitTests.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Product.UnitTests/ClassifiedAds.Modules.Product.UnitTests.csproj @@ -1,19 +1,19 @@  - net7.0 + net8.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Product/ClassifiedAds.Modules.Product.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Product/ClassifiedAds.Modules.Product.csproj index 53241e455..44c2bbf23 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Product/ClassifiedAds.Modules.Product.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Product/ClassifiedAds.Modules.Product.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 diff --git a/src/ModularMonolith/ClassifiedAds.Modules.Storage/ClassifiedAds.Modules.Storage.csproj b/src/ModularMonolith/ClassifiedAds.Modules.Storage/ClassifiedAds.Modules.Storage.csproj index 53241e455..44c2bbf23 100644 --- a/src/ModularMonolith/ClassifiedAds.Modules.Storage/ClassifiedAds.Modules.Storage.csproj +++ b/src/ModularMonolith/ClassifiedAds.Modules.Storage/ClassifiedAds.Modules.Storage.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 diff --git a/src/ModularMonolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj b/src/ModularMonolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj index c341106df..62fe282b2 100644 --- a/src/ModularMonolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj +++ b/src/ModularMonolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj @@ -1,20 +1,20 @@  - net7.0 + net8.0 ClassifiedAds.WebAPI f99dd7a7-93ea-4e83-ab01-b813707c2c57 - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/ModularMonolith/ClassifiedAds.WebAPI/Dockerfile b/src/ModularMonolith/ClassifiedAds.WebAPI/Dockerfile index ecb45dca3..ca52e452b 100644 --- a/src/ModularMonolith/ClassifiedAds.WebAPI/Dockerfile +++ b/src/ModularMonolith/ClassifiedAds.WebAPI/Dockerfile @@ -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.ModularMonolith # Copy csproj and restore as distinct layers @@ -30,7 +30,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.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.ModularMonolith COPY --from=build-env /ClassifiedAds.ModularMonolith/out . diff --git a/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json b/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json index f7c55491f..d641594c3 100644 --- a/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json +++ b/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json @@ -187,7 +187,7 @@ "Provider": "Local", "MasterEncryptionKey": "+2ZC9wrwlvPswPxCND0BjrKJ3CfOpImGtn4hloVwo2I=", "Local": { - "Path": "D:\\files" + "Path": "C:\\Data\\files" }, "Azure": { "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=xxx;AccountKey=xxx;EndpointSuffix=core.windows.net", diff --git a/src/ModularMonolith/README.md b/src/ModularMonolith/README.md index 6dc510671..81e83233e 100644 --- a/src/ModularMonolith/README.md +++ b/src/ModularMonolith/README.md @@ -76,7 +76,7 @@ - Build ``` - docker-compose build + docker compose build ``` - Tag diff --git a/src/ModularMonolith/docker-compose.yml b/src/ModularMonolith/docker-compose.yml index d2a1998cf..4854d37a6 100644 --- a/src/ModularMonolith/docker-compose.yml +++ b/src/ModularMonolith/docker-compose.yml @@ -3,7 +3,7 @@ services: db: image: "mcr.microsoft.com/mssql/server:2017-latest" ports: - - "1434:1433" + - "1433:1433" environment: SA_PASSWORD: "sqladmin123!@#" MSSQL_PID: "Developer" @@ -57,7 +57,7 @@ services: context: . dockerfile: ./ClassifiedAds.WebAPI/Dockerfile ports: - - "9002:80" + - "9002:8080" depends_on: - db - migrator @@ -81,8 +81,6 @@ services: build: context: . dockerfile: ./ClassifiedAds.BackgroundServer/Dockerfile - ports: - - "9004:80" depends_on: - db - migrator @@ -91,7 +89,7 @@ services: environment: DOTNET_ENVIRONMENT: ${DOTNET_ENVIRONMENT} CheckDependency__Enabled: "true" - CheckDependency__Host: "migrator:80,rabbitmq:5672" + CheckDependency__Host: "migrator:8080,rabbitmq:5672" MessageBroker__Provider: ${MessageBroker__Provider} MessageBroker__RabbitMQ__HostName: ${MessageBroker__RabbitMQ__HostName} Modules__AuditLog__ConnectionStrings__Default: ${Modules__AuditLog__ConnectionStrings__Default} diff --git a/src/Monolith/.env b/src/Monolith/.env index ed0cb83c1..95c666639 100644 --- a/src/Monolith/.env +++ b/src/Monolith/.env @@ -1,6 +1,7 @@ ASPNETCORE_ENVIRONMENT="Development" DOTNET_ENVIRONMENT="Development" ConnectionStrings__ClassifiedAds="Server=db;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False" +ConnectionStrings__IdentityServer_IdentityServer4="Server=db;Database=ClassifiedAds.IdentityServer.IdentityServer4;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False" MessageBroker__Provider="RabbitMQ" MessageBroker__RabbitMQ__HostName="rabbitmq" MessageBroker__Kafka__BootstrapServers="kafka:9092" @@ -13,5 +14,5 @@ Storage__Amazon__AccessKeyID="xxx" Storage__Amazon__SecretAccessKey="xxx" Storage__Amazon__BucketName="classifiedadds" Storage__Amazon__RegionEndpoint="ap-southeast-1" -ResourceServer__Endpoint="http://webapi" +ResourceServer__Endpoint="http://webapi:8080" ResourceServer__PublicEndpoint="http://host.docker.internal:9002" \ No newline at end of file diff --git a/src/Monolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/Monolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj index c3427cc1a..f7f888237 100644 --- a/src/Monolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj +++ b/src/Monolith/ClassifiedAds.Application/ClassifiedAds.Application.csproj @@ -1,14 +1,14 @@  - net7.0 + net8.0 Recommended All - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.Application/Users/Commands/SyncUsersCommand.cs b/src/Monolith/ClassifiedAds.Application/Users/Commands/SyncUsersCommand.cs index 8b28904f9..ec6bdaa1d 100644 --- a/src/Monolith/ClassifiedAds.Application/Users/Commands/SyncUsersCommand.cs +++ b/src/Monolith/ClassifiedAds.Application/Users/Commands/SyncUsersCommand.cs @@ -1,6 +1,5 @@ using ClassifiedAds.Domain.IdentityProviders; using ClassifiedAds.Domain.Repositories; -using ClassifiedAds.Infrastructure.IdentityProviders; using System; using System.Linq; using System.Threading; diff --git a/src/Monolith/ClassifiedAds.ArchTests/ClassifiedAds.ArchTests.csproj b/src/Monolith/ClassifiedAds.ArchTests/ClassifiedAds.ArchTests.csproj index 9ea097baf..9cbed7a8b 100644 --- a/src/Monolith/ClassifiedAds.ArchTests/ClassifiedAds.ArchTests.csproj +++ b/src/Monolith/ClassifiedAds.ArchTests/ClassifiedAds.ArchTests.csproj @@ -1,21 +1,21 @@ - net7.0 + net8.0 Recommended All false - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj b/src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj index fd34a06ff..ebef6b5d2 100644 --- a/src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj +++ b/src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj @@ -1,15 +1,15 @@  - net7.0 + net8.0 Recommended All 2afdbe02-eb10-41d2-8fee-1cb29d0dfffb - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile b/src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile index 3310989cc..29157f657 100644 --- a/src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile +++ b/src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile @@ -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.Monolith # Copy csproj and restore as distinct layers @@ -28,7 +28,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.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.Monolith COPY --from=build-env /ClassifiedAds.Monolith/out . diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json b/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json index 23bdfff92..6b3a0e0c8 100644 --- a/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json +++ b/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json @@ -12,7 +12,7 @@ }, "AllowedHosts": "*", "MessageBroker": { - "Provider": "Fake", + "Provider": "RabbitMQ", "RabbitMQ": { "HostName": "localhost", "UserName": "guest", diff --git a/src/Monolith/ClassifiedAds.Blazor.Modules/ClassifiedAds.Blazor.Modules.csproj b/src/Monolith/ClassifiedAds.Blazor.Modules/ClassifiedAds.Blazor.Modules.csproj index b95ebf1b3..768ee1c5f 100644 --- a/src/Monolith/ClassifiedAds.Blazor.Modules/ClassifiedAds.Blazor.Modules.csproj +++ b/src/Monolith/ClassifiedAds.Blazor.Modules/ClassifiedAds.Blazor.Modules.csproj @@ -1,19 +1,19 @@  - net7.0 + net8.0 Recommended All - + - - - - + + + + diff --git a/src/Monolith/ClassifiedAds.BlazorServerSide/ClassifiedAds.BlazorServerSide.csproj b/src/Monolith/ClassifiedAds.BlazorServerSide/ClassifiedAds.BlazorServerSide.csproj index 91805b1d0..9e307a927 100644 --- a/src/Monolith/ClassifiedAds.BlazorServerSide/ClassifiedAds.BlazorServerSide.csproj +++ b/src/Monolith/ClassifiedAds.BlazorServerSide/ClassifiedAds.BlazorServerSide.csproj @@ -1,19 +1,19 @@  - net7.0 + net8.0 Recommended All 752c7fb1-d2cf-490b-aa64-c3a9ea7b6734 - - - - - - + + + + + + diff --git a/src/Monolith/ClassifiedAds.BlazorServerSide/Dockerfile b/src/Monolith/ClassifiedAds.BlazorServerSide/Dockerfile index b8260f03b..44eb74556 100644 --- a/src/Monolith/ClassifiedAds.BlazorServerSide/Dockerfile +++ b/src/Monolith/ClassifiedAds.BlazorServerSide/Dockerfile @@ -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.Monolith # Copy csproj and restore as distinct layers @@ -28,7 +28,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.BlazorServerSide/ClassifiedAds.BlazorServerSide.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.Monolith COPY --from=build-env /ClassifiedAds.Monolith/out . diff --git a/src/Monolith/ClassifiedAds.BlazorWebAssembly/ClassifiedAds.BlazorWebAssembly.csproj b/src/Monolith/ClassifiedAds.BlazorWebAssembly/ClassifiedAds.BlazorWebAssembly.csproj index 8f3b2aa78..7f0c6101b 100644 --- a/src/Monolith/ClassifiedAds.BlazorWebAssembly/ClassifiedAds.BlazorWebAssembly.csproj +++ b/src/Monolith/ClassifiedAds.BlazorWebAssembly/ClassifiedAds.BlazorWebAssembly.csproj @@ -1,16 +1,16 @@  - net7.0 + net8.0 Recommended All - - - - + + + + diff --git a/src/Monolith/ClassifiedAds.ContractTests/ClassifiedAds.ContractTests.csproj b/src/Monolith/ClassifiedAds.ContractTests/ClassifiedAds.ContractTests.csproj index 34ba60347..de7101c5e 100644 --- a/src/Monolith/ClassifiedAds.ContractTests/ClassifiedAds.ContractTests.csproj +++ b/src/Monolith/ClassifiedAds.ContractTests/ClassifiedAds.ContractTests.csproj @@ -1,22 +1,22 @@  - net7.0 + net8.0 Recommended All false - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/src/Monolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj index 788465054..913aedb8d 100644 --- a/src/Monolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj +++ b/src/Monolith/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Monolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/Monolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj index 9b9ad3d7a..4641cebe6 100644 --- a/src/Monolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj +++ b/src/Monolith/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj @@ -1,20 +1,20 @@  - net7.0 + net8.0 Recommended All - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAuth0IdentityProvider.cs b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAuth0IdentityProvider.cs index 25e815d9d..59c3cf379 100644 --- a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAuth0IdentityProvider.cs +++ b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAuth0IdentityProvider.cs @@ -1,6 +1,4 @@ -using ClassifiedAds.Infrastructure.IdentityProviders; - -namespace ClassifiedAds.Domain.IdentityProviders; +namespace ClassifiedAds.Domain.IdentityProviders; public interface IAuth0IdentityProvider : IIdentityProvider { diff --git a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAzureActiveDirectoryB2CIdentityProvider.cs b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAzureActiveDirectoryB2CIdentityProvider.cs index ca1b1b753..e410f8a01 100644 --- a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAzureActiveDirectoryB2CIdentityProvider.cs +++ b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IAzureActiveDirectoryB2CIdentityProvider.cs @@ -1,6 +1,4 @@ -using ClassifiedAds.Infrastructure.IdentityProviders; - -namespace ClassifiedAds.Domain.IdentityProviders; +namespace ClassifiedAds.Domain.IdentityProviders; public interface IAzureActiveDirectoryB2CIdentityProvider : IIdentityProvider { diff --git a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IIdentityProvider.cs b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IIdentityProvider.cs index 49e5dda52..1175c2ce5 100644 --- a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IIdentityProvider.cs +++ b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IIdentityProvider.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace ClassifiedAds.Infrastructure.IdentityProviders; +namespace ClassifiedAds.Domain.IdentityProviders; public interface IIdentityProvider { diff --git a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IUser.cs b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IUser.cs index 35c751d4e..edffa1556 100644 --- a/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IUser.cs +++ b/src/Monolith/ClassifiedAds.Domain/IdentityProviders/IUser.cs @@ -1,4 +1,4 @@ -namespace ClassifiedAds.Infrastructure.IdentityProviders; +namespace ClassifiedAds.Domain.IdentityProviders; public interface IUser { diff --git a/src/Monolith/ClassifiedAds.EndToEndTests/ClassifiedAds.EndToEndTests.csproj b/src/Monolith/ClassifiedAds.EndToEndTests/ClassifiedAds.EndToEndTests.csproj index a628747de..e229de8fa 100644 --- a/src/Monolith/ClassifiedAds.EndToEndTests/ClassifiedAds.EndToEndTests.csproj +++ b/src/Monolith/ClassifiedAds.EndToEndTests/ClassifiedAds.EndToEndTests.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All false @@ -16,17 +16,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.GraphQL/ClassifiedAds.GraphQL.csproj b/src/Monolith/ClassifiedAds.GraphQL/ClassifiedAds.GraphQL.csproj index c6fd80040..13a7b8059 100644 --- a/src/Monolith/ClassifiedAds.GraphQL/ClassifiedAds.GraphQL.csproj +++ b/src/Monolith/ClassifiedAds.GraphQL/ClassifiedAds.GraphQL.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 Recommended All - + diff --git a/src/Monolith/ClassifiedAds.GraphQL/Dockerfile b/src/Monolith/ClassifiedAds.GraphQL/Dockerfile index 4ceb15d99..3af2a3ef3 100644 --- a/src/Monolith/ClassifiedAds.GraphQL/Dockerfile +++ b/src/Monolith/ClassifiedAds.GraphQL/Dockerfile @@ -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.Monolith # Copy csproj and restore as distinct layers @@ -28,7 +28,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.GraphQL/ClassifiedAds.GraphQL.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.Monolith COPY --from=build-env /ClassifiedAds.Monolith/out . diff --git a/src/Monolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/Monolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj index c07638816..8703d8777 100644 --- a/src/Monolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj +++ b/src/Monolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj @@ -1,75 +1,73 @@  - net7.0 + net8.0 Recommended All - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Monolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs b/src/Monolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs index c59c2176f..50fe9e30c 100644 --- a/src/Monolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs +++ b/src/Monolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs @@ -32,7 +32,6 @@ private static void UseClassifiedAdsLogger(this IWebHostEnvironment env, Logging loggerConfiguration = loggerConfiguration .MinimumLevel.Debug() .Enrich.FromLogContext() - .Enrich.With() .Enrich.WithMachineName() .Enrich.WithEnvironmentUserName() .Enrich.WithProperty("ProcessId", Environment.ProcessId) @@ -249,7 +248,6 @@ private static void UseClassifiedAdsLogger(this IHostEnvironment env, LoggingOpt loggerConfiguration = loggerConfiguration .MinimumLevel.Debug() .Enrich.FromLogContext() - .Enrich.With() .Enrich.WithMachineName() .Enrich.WithEnvironmentUserName() .Enrich.WithProperty("ProcessId", Environment.ProcessId) diff --git a/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs b/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs index 008bb7121..6fd2960e0 100644 --- a/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs +++ b/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using OpenTelemetry; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -35,15 +34,6 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl .AddEntityFrameworkCoreInstrumentation() .AddHttpClientInstrumentation(); - if (options?.Jaeger?.IsEnabled ?? false) - { - builder.AddJaegerExporter(jaegerOptions => - { - jaegerOptions.AgentHost = options.Jaeger.AgentHost; - jaegerOptions.AgentPort = options.Jaeger.AgentPort; - }); - } - if (options?.Zipkin?.IsEnabled ?? false) { builder.AddZipkinExporter(zipkinOptions => @@ -75,8 +65,7 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl otlpOptions.Endpoint = new Uri(options.Otlp.Endpoint); }); } - }) - .StartWithHost(); + }); return services; } diff --git a/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs b/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs index 47ea4889e..27ee0c97b 100644 --- a/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs +++ b/src/Monolith/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryOptions.cs @@ -8,8 +8,6 @@ public class OpenTelemetryOptions public ZipkinOptions Zipkin { get; set; } - public JaegerOptions Jaeger { get; set; } - public OtlpOptions Otlp { get; set; } } @@ -20,15 +18,6 @@ public class ZipkinOptions public string Endpoint { get; set; } } -public class JaegerOptions -{ - public bool IsEnabled { get; set; } - - public string AgentHost { get; set; } - - public int AgentPort { get; set; } -} - public class OtlpOptions { public bool IsEnabled { get; set; } diff --git a/src/Monolith/ClassifiedAds.IntegrationTests/ClassifiedAds.IntegrationTests.csproj b/src/Monolith/ClassifiedAds.IntegrationTests/ClassifiedAds.IntegrationTests.csproj index 8c427b36b..3552a003f 100644 --- a/src/Monolith/ClassifiedAds.IntegrationTests/ClassifiedAds.IntegrationTests.csproj +++ b/src/Monolith/ClassifiedAds.IntegrationTests/ClassifiedAds.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All false @@ -16,26 +16,26 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.IntegrationTests/appsettings.json b/src/Monolith/ClassifiedAds.IntegrationTests/appsettings.json index 57a7d4f76..64030ffac 100644 --- a/src/Monolith/ClassifiedAds.IntegrationTests/appsettings.json +++ b/src/Monolith/ClassifiedAds.IntegrationTests/appsettings.json @@ -16,5 +16,5 @@ "Password": "v*7Un8b4rcN@<-RN", "Scope": "ClassifiedAds.WebAPI" }, - "DownloadsFolder": "D:\\Downloads" + "DownloadsFolder": "C:\\Data\\Downloads" } diff --git a/src/Monolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj b/src/Monolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj index 9045f8380..34282ff7a 100644 --- a/src/Monolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj +++ b/src/Monolith/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 Recommended All b8df572d-5be2-4f41-b55a-8f4e2ef2b569 @@ -21,13 +21,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.Migrator/Dockerfile b/src/Monolith/ClassifiedAds.Migrator/Dockerfile index d32182214..7e6faee2d 100644 --- a/src/Monolith/ClassifiedAds.Migrator/Dockerfile +++ b/src/Monolith/ClassifiedAds.Migrator/Dockerfile @@ -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.Monolith # Copy csproj and restore as distinct layers @@ -28,7 +28,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.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.Monolith COPY --from=build-env /ClassifiedAds.Monolith/out . diff --git a/src/Monolith/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj b/src/Monolith/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj index 750109116..d09c212a4 100644 --- a/src/Monolith/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj +++ b/src/Monolith/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj @@ -1,18 +1,18 @@  - net7.0 + net8.0 Recommended All - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.UnitTests/ClassifiedAds.UnitTests.csproj b/src/Monolith/ClassifiedAds.UnitTests/ClassifiedAds.UnitTests.csproj index bdd26a5a1..fd05a8b27 100644 --- a/src/Monolith/ClassifiedAds.UnitTests/ClassifiedAds.UnitTests.csproj +++ b/src/Monolith/ClassifiedAds.UnitTests/ClassifiedAds.UnitTests.csproj @@ -1,29 +1,29 @@  - net7.0 + net8.0 Recommended All false - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj b/src/Monolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj index b0d236ed2..7a9c0e839 100644 --- a/src/Monolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj +++ b/src/Monolith/ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj @@ -1,21 +1,21 @@  - net7.0 + net8.0 Recommended All a3cce8d1-91dc-440d-aa9d-6fc323cb0ab6 - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Monolith/ClassifiedAds.WebAPI/Dockerfile b/src/Monolith/ClassifiedAds.WebAPI/Dockerfile index be5b662e0..4c6af310a 100644 --- a/src/Monolith/ClassifiedAds.WebAPI/Dockerfile +++ b/src/Monolith/ClassifiedAds.WebAPI/Dockerfile @@ -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.Monolith # Copy csproj and restore as distinct layers @@ -28,7 +28,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.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.Monolith COPY --from=build-env /ClassifiedAds.Monolith/out . diff --git a/src/Monolith/ClassifiedAds.WebAPI/appsettings.json b/src/Monolith/ClassifiedAds.WebAPI/appsettings.json index 807f8b96a..23d64f59c 100644 --- a/src/Monolith/ClassifiedAds.WebAPI/appsettings.json +++ b/src/Monolith/ClassifiedAds.WebAPI/appsettings.json @@ -101,7 +101,7 @@ "Provider": "Local", "MasterEncryptionKey": "+2ZC9wrwlvPswPxCND0BjrKJ3CfOpImGtn4hloVwo2I=", "Local": { - "Path": "D:\\files" + "Path": "C:\\Data\\files" }, "Azure": { "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=xxx;AccountKey=xxx;EndpointSuffix=core.windows.net", diff --git a/src/Monolith/ClassifiedAds.WebMVC/ClassifiedAds.WebMVC.csproj b/src/Monolith/ClassifiedAds.WebMVC/ClassifiedAds.WebMVC.csproj index 58146bcf6..e7b906349 100644 --- a/src/Monolith/ClassifiedAds.WebMVC/ClassifiedAds.WebMVC.csproj +++ b/src/Monolith/ClassifiedAds.WebMVC/ClassifiedAds.WebMVC.csproj @@ -1,25 +1,25 @@  - net7.0 + net8.0 Recommended All 715a7fa5-7600-457a-bcdf-662d50011045 - - - - - - - - - - - - + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Monolith/ClassifiedAds.WebMVC/Dockerfile b/src/Monolith/ClassifiedAds.WebMVC/Dockerfile index 060d97846..1427b91f4 100644 --- a/src/Monolith/ClassifiedAds.WebMVC/Dockerfile +++ b/src/Monolith/ClassifiedAds.WebMVC/Dockerfile @@ -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.Monolith # Copy csproj and restore as distinct layers @@ -28,7 +28,7 @@ COPY . ./ RUN dotnet publish ./ClassifiedAds.WebMVC/ClassifiedAds.WebMVC.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.Monolith COPY --from=build-env /ClassifiedAds.Monolith/out . diff --git a/src/Monolith/ClassifiedAds.WebMVC/appsettings.json b/src/Monolith/ClassifiedAds.WebMVC/appsettings.json index 4d0e0039a..7fa571dab 100644 --- a/src/Monolith/ClassifiedAds.WebMVC/appsettings.json +++ b/src/Monolith/ClassifiedAds.WebMVC/appsettings.json @@ -34,7 +34,7 @@ "Microsoft": "Warning" }, "File": { - "MinimumLogEventLevel": "Debug" + "MinimumLogEventLevel": "Information" }, "Elasticsearch": { "IsEnabled": false, @@ -101,7 +101,7 @@ "Storage": { "Provider": "Local", "Local": { - "Path": "D:\\files" + "Path": "C:\\Data\\files" }, "Azure": { "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=xxx;AccountKey=xxx;EndpointSuffix=core.windows.net", diff --git a/src/Monolith/README.md b/src/Monolith/README.md index 0a82ae92d..0dea7e9af 100644 --- a/src/Monolith/README.md +++ b/src/Monolith/README.md @@ -55,7 +55,7 @@ - Build ``` - docker-compose build + docker compose build ``` - Tag diff --git a/src/Monolith/docker-compose.yml b/src/Monolith/docker-compose.yml index 9a8870475..74dcfa11f 100644 --- a/src/Monolith/docker-compose.yml +++ b/src/Monolith/docker-compose.yml @@ -3,7 +3,7 @@ services: db: image: "mcr.microsoft.com/mssql/server:2017-latest" ports: - - "1434:1433" + - "1433:1433" environment: SA_PASSWORD: "sqladmin123!@#" MSSQL_PID: "Developer" @@ -61,6 +61,7 @@ services: environment: ASPNETCORE_ENVIRONMENT: ${ASPNETCORE_ENVIRONMENT} ConnectionStrings__ClassifiedAds: ${ConnectionStrings__ClassifiedAds} + ConnectionStrings__IdentityServer: ${ConnectionStrings__IdentityServer_IdentityServer4} CookiePolicyOptions__IsEnabled: "true" CookiePolicyOptions__MinimumSameSitePolicy: "Lax" CookiePolicyOptions__Secure: "None" @@ -70,7 +71,7 @@ services: context: . dockerfile: ./ClassifiedAds.WebAPI/Dockerfile ports: - - "9002:80" + - "9002:8080" depends_on: - db - migrator @@ -97,7 +98,7 @@ services: context: . dockerfile: ./ClassifiedAds.WebMVC/Dockerfile ports: - - "9003:80" + - "9003:8080" depends_on: - db - migrator @@ -112,7 +113,7 @@ services: CookiePolicyOptions__MinimumSameSitePolicy: "Lax" CookiePolicyOptions__Secure: "None" CheckDependency__Enabled: "true" - CheckDependency__Host: "migrator:80" + CheckDependency__Host: "migrator:8080" OpenIdConnect__Authority: "http://host.docker.internal:9000" OpenIdConnect__RequireHttpsMetadata: "false" ResourceServer__Endpoint: ${ResourceServer__Endpoint} @@ -136,7 +137,7 @@ services: context: . dockerfile: ./ClassifiedAds.BlazorServerSide/Dockerfile ports: - - "9008:80" + - "9008:8080" depends_on: - identityserver - webapi @@ -154,8 +155,6 @@ services: build: context: . dockerfile: ./ClassifiedAds.BackgroundServer/Dockerfile - ports: - - "9004:80" depends_on: - db - migrator @@ -165,7 +164,7 @@ services: DOTNET_ENVIRONMENT: ${DOTNET_ENVIRONMENT} ConnectionStrings__ClassifiedAds: ${ConnectionStrings__ClassifiedAds} CheckDependency__Enabled: "true" - CheckDependency__Host: "migrator:80,rabbitmq:5672" + CheckDependency__Host: "migrator:8080,rabbitmq:5672" MessageBroker__Provider: ${MessageBroker__Provider} MessageBroker__RabbitMQ__HostName: ${MessageBroker__RabbitMQ__HostName} MessageBroker__Kafka__BootstrapServers: ${MessageBroker__Kafka__BootstrapServers} @@ -185,7 +184,7 @@ services: context: . dockerfile: ./ClassifiedAds.GraphQL/Dockerfile ports: - - "9006:80" + - "9006:8080" depends_on: - webapi environment: