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/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: