From 3a43aef8752d92c80177e714a44f102b9957ef7d Mon Sep 17 00:00:00 2001 From: Timo Notheisen <65653426+tnotheis@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:21:48 +0100 Subject: [PATCH] Upgrade to dotnet 9 (#944) * chore: remove explicit reference of target framework * chore: upgrade packages * chore: directly reference packages to fix vulnerabilities * chore: upgrade to dotnet 9 * chore: get rid of deprecated package * refactor: use X509CertificateLoader * Revert "chore: directly reference packages to fix vulnerabilities" This reverts commit d974380d1c461d789e5d4d0409abd836f1f7923a. * chore: update pgsql * chore: catch SqlException from different namespace * chore: use X509CertificateLoader * chore: don't use X509CertificateLoader * ci: upgrade to dotnet 9 in pipelines * chore: upgrade to dotnet 9 in Dockerfiles * chore: use alpine * chore: fix chiseled images * chore: init property with `null!` * chore: downgrade archunit * ci: use 9.x instead of 9.0.x * chore: uncomment TreatWarningsAsErrors * chore: disable warning * chore: unignore fixed vulnerability * chore: don't use nightly image * chore: move package reference to correct item group --- .github/workflows/codeql-analysis-cron.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/test.yml | 10 ++++----- .../Persistence/Database/AdminApiDbContext.cs | 2 +- .../AdminApi/src/AdminApi/AdminApi.csproj | 6 ++--- Applications/AdminApi/src/AdminApi/Dockerfile | 10 ++++----- .../AdminApi.Tests.Integration.csproj | 12 +++++----- Applications/AdminCli/src/AdminCli/Dockerfile | 4 ++-- .../ConsumerApi/src/ConsumerApi.csproj | 10 ++++----- Applications/ConsumerApi/src/Dockerfile | 10 ++++----- .../IServiceCollectionExtensions.cs | 2 ++ .../ConsumerApi.Tests.Integration.csproj | 12 +++++----- ...i.Tests.Performance.SnapshotCreator.csproj | 2 +- .../DatabaseMigrator/DatabaseMigrator.csproj | 10 ++++----- .../src/DatabaseMigrator/Dockerfile | 4 ++-- .../src/DatabaseMigrator/Executor.cs | 2 +- .../DatabaseMigrator.Tests.csproj | 4 ---- .../src/EventHandlerService/Dockerfile | 4 ++-- .../src/FilesSanityCheck/Dockerfile | 4 ++-- .../FilesSanityCheck/FilesSanityCheck.csproj | 2 +- .../HealthCheck/src/HealthCheck.csproj | 2 -- .../src/Job.IdentityDeletion/Dockerfile | 4 ++-- .../Job.IdentityDeletion.csproj | 2 +- .../SseServer/src/SseServer/Dockerfile | 10 ++++----- .../IServiceCollectionExtensions.cs | 2 ++ .../SseServer/src/SseServer/SseServer.csproj | 4 ++-- .../BuildingBlocks.API.csproj | 8 +++---- .../Extensions/HostExtensions.cs | 2 +- ...dingBlocks.Application.Abstractions.csproj | 2 +- .../BuildingBlocks.Application.csproj | 7 +++--- .../BuildingBlocks.Infrastructure.csproj | 22 +++++++++---------- BuildingBlocks/src/Tooling/Tooling.csproj | 2 +- .../src/UnitTestTools/UnitTestTools.csproj | 5 +++-- ...BuildingBlocks.Infrastructure.Tests.csproj | 3 --- .../GoogleCloudPubSubTests.cs | 19 +++++----------- .../Tests/GoogleCloudStorageTests.cs | 5 +++-- .../Common.Infrastructure.csproj | 3 ++- Directory.Build.props | 3 +-- .../Challenges.Application.csproj | 4 ++-- .../Challenges.ConsumerApi.csproj | 2 +- .../Challenges.Infrastructure.csproj | 6 ++--- .../Challenges.Jobs.Cleanup.csproj | 2 +- .../src/Challenges.Jobs.Cleanup/Dockerfile | 4 ++-- .../Devices.Application.csproj | 5 +++-- .../Devices.ConsumerApi.csproj | 2 +- .../src/Devices.Domain/Devices.Domain.csproj | 4 ++-- .../Devices.Infrastructure.csproj | 20 ++++++++--------- Modules/Directory.Build.props | 3 +-- .../Files.Application.csproj | 2 +- .../Files.ConsumerApi.csproj | 2 +- .../Files.Infrastructure.csproj | 6 ++--- .../Files.Domain.Tests.csproj | 4 ---- .../Messages.Application.csproj | 2 +- .../Messages.Common/Messages.Common.csproj | 2 +- .../Messages.ConsumerApi.csproj | 2 +- .../Messages.Infrastructure.csproj | 6 ++--- .../Quotas.ConsumerApi.csproj | 2 +- .../src/Quotas.Domain/Quotas.Domain.csproj | 2 +- .../Quotas.Infrastructure.csproj | 8 +++---- .../Relationships.Application.csproj | 2 +- .../Relationships.Common.csproj | 2 +- .../Relationships.ConsumerApi.csproj | 2 +- .../Relationships.Infrastructure.csproj | 6 ++--- .../Synchronization.Application.csproj | 4 ++-- .../Synchronization.ConsumerApi.csproj | 2 +- .../Synchronization.Infrastructure.csproj | 8 +++---- .../Tags.ConsumerApi/Tags.ConsumerApi.csproj | 2 +- .../Tags/src/Tags.Domain/Tags.Domain.csproj | 6 ----- .../Tags.Infrastructure.csproj | 6 ----- .../Tokens.Application.csproj | 3 ++- .../Tokens.ConsumerApi.csproj | 2 +- ...ns.Infrastructure.Database.Postgres.csproj | 4 ++++ ...s.Infrastructure.Database.SqlServer.csproj | 4 ++++ .../Tokens.Infrastructure.csproj | 7 +++--- .../Tokens.Application.Tests.csproj | 1 + .../Tokens.Domain.Tests.csproj | 1 + .../src/ConsumerApi.Sdk.csproj | 5 ----- 77 files changed, 178 insertions(+), 198 deletions(-) diff --git a/.github/workflows/codeql-analysis-cron.yml b/.github/workflows/codeql-analysis-cron.yml index 5dce63d0e5..e8baea424c 100644 --- a/.github/workflows/codeql-analysis-cron.yml +++ b/.github/workflows/codeql-analysis-cron.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.0.x" + dotnet-version: "9.x" - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cf67b1c5e5..87121a3f47 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.0.x" + dotnet-version: "9.x" - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 202630815c..a3a376af2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.x" + dotnet-version: "9.x" - name: Cache NuGet packages uses: actions/cache@v4 with: @@ -73,7 +73,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: "8.x" + dotnet-version: "9.x" - name: Cache NuGet packages uses: actions/cache@v4 with: @@ -134,7 +134,7 @@ jobs: - name: Setup NuGet uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.x + dotnet-version: 9.x - name: Cache Image uses: actions/cache@v4 @@ -198,7 +198,7 @@ jobs: - name: Setup NuGet uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.x + dotnet-version: 9.x - name: Cache NuGet packages uses: actions/cache@v4 @@ -344,7 +344,7 @@ jobs: - name: Setup Dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.x + dotnet-version: 9.x - name: Install nuget-licenses tool run: dotnet tool install --global nuget-license - name: Show Allowed Licenses diff --git a/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/AdminApiDbContext.cs b/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/AdminApiDbContext.cs index 98a0da7b6f..3c84230d35 100644 --- a/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/AdminApiDbContext.cs +++ b/Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/AdminApiDbContext.cs @@ -27,7 +27,7 @@ public AdminApiDbContext(DbContextOptions options, IServicePr public DbSet RelationshipOverviews { get; set; } = null!; - public DbSet MessageOverviews { get; set; } + public DbSet MessageOverviews { get; set; } = null!; protected override void OnModelCreating(ModelBuilder builder) { diff --git a/Applications/AdminApi/src/AdminApi/AdminApi.csproj b/Applications/AdminApi/src/AdminApi/AdminApi.csproj index d92aa2c0ff..07d6ba4a59 100644 --- a/Applications/AdminApi/src/AdminApi/AdminApi.csproj +++ b/Applications/AdminApi/src/AdminApi/AdminApi.csproj @@ -5,13 +5,13 @@ - + - + - + diff --git a/Applications/AdminApi/src/AdminApi/Dockerfile b/Applications/AdminApi/src/AdminApi/Dockerfile index 579c2b4e75..9508c092c7 100644 --- a/Applications/AdminApi/src/AdminApi/Dockerfile +++ b/Applications/AdminApi/src/AdminApi/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /opt/chisel RUN go build ./cmd/chisel #### Build application #### -FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env # use chisel to install libicu RUN apt-get update \ @@ -19,11 +19,11 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* COPY --from=chisel /opt/chisel/chisel /usr/bin/ -COPY --from=mcr.microsoft.com/dotnet/nightly/runtime:8.0-jammy-chiseled / /runtime-ref +COPY --from=mcr.microsoft.com/dotnet/runtime:9.0-noble-chiseled / /runtime-ref RUN mkdir /rootfs \ - && chisel cut --release "ubuntu-22.04" --root /rootfs \ - libicu70_libs \ + && chisel cut --release "ubuntu-24.04" --root /rootfs \ + libicu74_libs \ \ # Remove duplicates from rootfs that exist in runtime-ref && fdupes /runtime-ref /rootfs -rdpN \ @@ -98,7 +98,7 @@ WORKDIR /src/apps/admin_ui RUN flutter build web --output /build #### Final ##### -FROM mcr.microsoft.com/dotnet/aspnet:8.0.11-jammy-chiseled +FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled LABEL org.opencontainers.image.source="https://github.com/nmshd/backbone" HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 CMD [ "dotnet", "/app/health/Backbone.HealthCheck.dll", "--", "http://localhost:8080/health" ] diff --git a/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj b/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj index d5d9671534..b9cde92c0d 100644 --- a/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj +++ b/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj @@ -5,14 +5,14 @@ - - - - - + + + + + - + diff --git a/Applications/AdminCli/src/AdminCli/Dockerfile b/Applications/AdminCli/src/AdminCli/Dockerfile index a513d417c1..d14e004c5e 100644 --- a/Applications/AdminCli/src/AdminCli/Dockerfile +++ b/Applications/AdminCli/src/AdminCli/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0.11 AS base +FROM mcr.microsoft.com/dotnet/runtime:9.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0.404 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["Directory.Build.props", "."] diff --git a/Applications/ConsumerApi/src/ConsumerApi.csproj b/Applications/ConsumerApi/src/ConsumerApi.csproj index 1f7a6ea7b7..a137af82d2 100644 --- a/Applications/ConsumerApi/src/ConsumerApi.csproj +++ b/Applications/ConsumerApi/src/ConsumerApi.csproj @@ -7,14 +7,14 @@ - + - - + + - - + + diff --git a/Applications/ConsumerApi/src/Dockerfile b/Applications/ConsumerApi/src/Dockerfile index acbe5752ed..aeb7b45f5c 100644 --- a/Applications/ConsumerApi/src/Dockerfile +++ b/Applications/ConsumerApi/src/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /opt/chisel RUN go build ./cmd/chisel #### Build application #### -FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env # use chisel to install libicu RUN apt-get update \ @@ -19,11 +19,11 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* COPY --from=chisel /opt/chisel/chisel /usr/bin/ -COPY --from=mcr.microsoft.com/dotnet/nightly/runtime:8.0-jammy-chiseled / /runtime-ref +COPY --from=mcr.microsoft.com/dotnet/runtime:9.0-noble-chiseled / /runtime-ref RUN mkdir /rootfs \ - && chisel cut --release "ubuntu-22.04" --root /rootfs \ - libicu70_libs \ + && chisel cut --release "ubuntu-24.04" --root /rootfs \ + libicu74_libs \ \ # Remove duplicates from rootfs that exist in runtime-ref && fdupes /runtime-ref /rootfs -rdpN \ @@ -60,7 +60,7 @@ RUN dotnet publish /p:ContinuousIntegrationBuild=true --configuration Release -- RUN dotnet publish /p:ContinuousIntegrationBuild=true --configuration Release --output /app/publish/health "Applications/HealthCheck/src/HealthCheck.csproj" ### Final #### -FROM mcr.microsoft.com/dotnet/aspnet:8.0.11-jammy-chiseled +FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled LABEL org.opencontainers.image.source="https://github.com/nmshd/backbone" HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 CMD [ "dotnet", "/app/health/Backbone.HealthCheck.dll", "--", "http://localhost:8080/health" ] diff --git a/Applications/ConsumerApi/src/Extensions/IServiceCollectionExtensions.cs b/Applications/ConsumerApi/src/Extensions/IServiceCollectionExtensions.cs index 935da9959e..685a89f2df 100644 --- a/Applications/ConsumerApi/src/Extensions/IServiceCollectionExtensions.cs +++ b/Applications/ConsumerApi/src/Extensions/IServiceCollectionExtensions.cs @@ -131,7 +131,9 @@ public static IServiceCollection AddCustomOpenIddict(this IServiceCollection ser .AddServer(options => { var privateKeyBytes = Convert.FromBase64String(configuration.JwtSigningCertificate); +#pragma warning disable SYSLIB0057 // The constructor is obsolete. But I didn't manage to get the suggested alternative to work. var certificate = new X509Certificate2(privateKeyBytes, (string?)null); +#pragma warning restore SYSLIB0057 options.AddSigningCertificate(certificate); options.SetTokenEndpointUris("connect/token"); diff --git a/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj b/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj index 1099d58dde..b9346fdf3a 100644 --- a/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj +++ b/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj @@ -5,14 +5,14 @@ - - - - - + + + + + - + diff --git a/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/tools/snapshot-creator/ConsumerApi.Tests.Performance.SnapshotCreator.csproj b/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/tools/snapshot-creator/ConsumerApi.Tests.Performance.SnapshotCreator.csproj index 5c2d7776e7..6058d16b76 100644 --- a/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/tools/snapshot-creator/ConsumerApi.Tests.Performance.SnapshotCreator.csproj +++ b/Applications/ConsumerApi/test/ConsumerApi.Tests.Performance/tools/snapshot-creator/ConsumerApi.Tests.Performance.SnapshotCreator.csproj @@ -6,11 +6,11 @@ + - diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj b/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj index 43faf9187c..7d5f29e80d 100644 --- a/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj +++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/DatabaseMigrator.csproj @@ -7,13 +7,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -26,7 +26,7 @@ - + diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile b/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile index 05a3a2a45c..8c04e7e1ca 100644 --- a/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile +++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-alpine3.18 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0.404 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Directory.Build.props", "."] diff --git a/Applications/DatabaseMigrator/src/DatabaseMigrator/Executor.cs b/Applications/DatabaseMigrator/src/DatabaseMigrator/Executor.cs index 3065748683..b6e5a8f033 100644 --- a/Applications/DatabaseMigrator/src/DatabaseMigrator/Executor.cs +++ b/Applications/DatabaseMigrator/src/DatabaseMigrator/Executor.cs @@ -1,4 +1,4 @@ -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/DatabaseMigrator.Tests.csproj b/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/DatabaseMigrator.Tests.csproj index 1dbabac879..7bf5e3f936 100644 --- a/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/DatabaseMigrator.Tests.csproj +++ b/Applications/DatabaseMigrator/test/DatabaseMigrator.Tests/DatabaseMigrator.Tests.csproj @@ -1,10 +1,6 @@ - net8.0 - enable - enable - false true diff --git a/Applications/EventHandlerService/src/EventHandlerService/Dockerfile b/Applications/EventHandlerService/src/EventHandlerService/Dockerfile index 0074d71bae..b7d75b3366 100644 --- a/Applications/EventHandlerService/src/EventHandlerService/Dockerfile +++ b/Applications/EventHandlerService/src/EventHandlerService/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-alpine3.18 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0.404 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Directory.Build.props", "."] diff --git a/Applications/FilesSanityCheck/src/FilesSanityCheck/Dockerfile b/Applications/FilesSanityCheck/src/FilesSanityCheck/Dockerfile index a1585d8ab1..632598e575 100644 --- a/Applications/FilesSanityCheck/src/FilesSanityCheck/Dockerfile +++ b/Applications/FilesSanityCheck/src/FilesSanityCheck/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base +FROM mcr.microsoft.com/dotnet/runtime:9.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["Directory.Build.props", "."] diff --git a/Applications/FilesSanityCheck/src/FilesSanityCheck/FilesSanityCheck.csproj b/Applications/FilesSanityCheck/src/FilesSanityCheck/FilesSanityCheck.csproj index 1baa37ae4e..169bcf9a6d 100644 --- a/Applications/FilesSanityCheck/src/FilesSanityCheck/FilesSanityCheck.csproj +++ b/Applications/FilesSanityCheck/src/FilesSanityCheck/FilesSanityCheck.csproj @@ -6,7 +6,7 @@ - + diff --git a/Applications/HealthCheck/src/HealthCheck.csproj b/Applications/HealthCheck/src/HealthCheck.csproj index e7ac3860be..139aaf5884 100644 --- a/Applications/HealthCheck/src/HealthCheck.csproj +++ b/Applications/HealthCheck/src/HealthCheck.csproj @@ -2,8 +2,6 @@ Exe - net8.0 - enable diff --git a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Dockerfile b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Dockerfile index a837f0f289..c347ae9806 100644 --- a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Dockerfile +++ b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Dockerfile @@ -1,7 +1,7 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-alpine3.18 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0.404 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Directory.Build.props", "."] diff --git a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj index 778af60a30..b7382d119b 100644 --- a/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj +++ b/Applications/IdentityDeletionJobs/src/Job.IdentityDeletion/Job.IdentityDeletion.csproj @@ -8,7 +8,7 @@ - + diff --git a/Applications/SseServer/src/SseServer/Dockerfile b/Applications/SseServer/src/SseServer/Dockerfile index 2758594c54..557e62218c 100644 --- a/Applications/SseServer/src/SseServer/Dockerfile +++ b/Applications/SseServer/src/SseServer/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /opt/chisel RUN go build ./cmd/chisel #### Build application #### -FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env # use chisel to install libicu RUN apt-get update \ @@ -19,11 +19,11 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* COPY --from=chisel /opt/chisel/chisel /usr/bin/ -COPY --from=mcr.microsoft.com/dotnet/nightly/runtime:8.0-jammy-chiseled / /runtime-ref +COPY --from=mcr.microsoft.com/dotnet/runtime:9.0-noble-chiseled / /runtime-ref RUN mkdir /rootfs \ - && chisel cut --release "ubuntu-22.04" --root /rootfs \ - libicu70_libs \ + && chisel cut --release "ubuntu-24.04" --root /rootfs \ + libicu74_libs \ \ # Remove duplicates from rootfs that exist in runtime-ref && fdupes /runtime-ref /rootfs -rdpN \ @@ -60,7 +60,7 @@ RUN dotnet publish /p:ContinuousIntegrationBuild=true --configuration Release -- RUN dotnet publish /p:ContinuousIntegrationBuild=true --configuration Release --output /app/publish/health "Applications/HealthCheck/src/HealthCheck.csproj" ### Final #### -FROM mcr.microsoft.com/dotnet/aspnet:8.0.11-jammy-chiseled +FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled LABEL org.opencontainers.image.source="https://github.com/nmshd/backbone" HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 CMD [ "dotnet", "/app/health/Backbone.HealthCheck.dll", "--", "http://localhost:8080/health" ] diff --git a/Applications/SseServer/src/SseServer/Extensions/IServiceCollectionExtensions.cs b/Applications/SseServer/src/SseServer/Extensions/IServiceCollectionExtensions.cs index 031ed467de..8058bc0495 100644 --- a/Applications/SseServer/src/SseServer/Extensions/IServiceCollectionExtensions.cs +++ b/Applications/SseServer/src/SseServer/Extensions/IServiceCollectionExtensions.cs @@ -68,7 +68,9 @@ public static void AddCustomAspNetCore(this IServiceCollection services, services.AddAuthentication().AddJwtBearer(options => { var privateKeyBytes = Convert.FromBase64String(configuration.Authentication.JwtSigningCertificate); +#pragma warning disable SYSLIB0057 // The constructor is obsolete. But I didn't manage to get the suggested alternative to work. var certificate = new X509Certificate2(privateKeyBytes, (string?)null); +#pragma warning restore SYSLIB0057 options.TokenValidationParameters.IssuerSigningKey = new X509SecurityKey(certificate); options.TokenValidationParameters.ValidateIssuer = false; options.TokenValidationParameters.ValidateAudience = false; diff --git a/Applications/SseServer/src/SseServer/SseServer.csproj b/Applications/SseServer/src/SseServer/SseServer.csproj index 1d7a91a31d..19a740078f 100644 --- a/Applications/SseServer/src/SseServer/SseServer.csproj +++ b/Applications/SseServer/src/SseServer/SseServer.csproj @@ -2,10 +2,10 @@ - + - + diff --git a/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj b/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj index a5ee043048..9c713e3d80 100644 --- a/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj +++ b/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj @@ -3,11 +3,11 @@ - - - + + + - + diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs index 87b0c4d78e..c193355ae0 100644 --- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs +++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs @@ -1,4 +1,4 @@ -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj index d9a5eebe1e..9f603aca24 100644 --- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj +++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj @@ -10,7 +10,7 @@ - + diff --git a/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj b/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj index cc5207005c..7d5d8b961f 100644 --- a/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj +++ b/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj @@ -1,10 +1,11 @@ - + - - + + + diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj index 09a3a288a5..d27edc9eef 100644 --- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj +++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj @@ -3,20 +3,20 @@ - + - - - - - - - + + + + + + + - - - + + + diff --git a/BuildingBlocks/src/Tooling/Tooling.csproj b/BuildingBlocks/src/Tooling/Tooling.csproj index 3ee9e5fe59..78cc55ef63 100644 --- a/BuildingBlocks/src/Tooling/Tooling.csproj +++ b/BuildingBlocks/src/Tooling/Tooling.csproj @@ -1,7 +1,7 @@ - + diff --git a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj index d69e27a842..476c8f670b 100644 --- a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj +++ b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj @@ -8,10 +8,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + + diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj index e1a0b70fd2..51e4e50818 100644 --- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj +++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj @@ -1,17 +1,14 @@ - net8.0 false - - all diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs index fd6a8323c5..cff720eb89 100644 --- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs +++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs @@ -5,7 +5,6 @@ using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestDomainEventHandlers; using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestDomainEvents; using Backbone.Tooling.Extensions; -using Divergic.Logging.Xunit; using FakeItEasy; using Google.Api.Gax; using Google.Apis.Auth.OAuth2; @@ -13,7 +12,6 @@ using Grpc.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit.Abstractions; namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub; @@ -21,9 +19,9 @@ public class GoogleCloudPubSubTests : AbstractTestsBase, IAsyncDisposable { private readonly EventBusFactory _factory; - public GoogleCloudPubSubTests(ITestOutputHelper output) + public GoogleCloudPubSubTests() { - _factory = new EventBusFactory(output); + _factory = new EventBusFactory(); } [Fact(Skip = "No valid emulator for GCP")] @@ -144,23 +142,18 @@ private record Instance( private const string TOPIC_NAME = "test-topic"; private const string SUBSCRIPTION_NAME_PREFIX = "subscription1"; - private readonly ICacheLogger _logger; - private const string CONNECTION_INFO = ""; private readonly List _instances = []; - public EventBusFactory(ITestOutputHelper output) - { - _logger = output.BuildLoggerFor(); - } - public EventBusGoogleCloudPubSub CreateEventBus(string subscriptionNamePrefix = SUBSCRIPTION_NAME_PREFIX) { var builder = new ContainerBuilder(); builder.RegisterType(); builder.RegisterType(); + var logger = A.Fake>(); + var autofacServiceProvider = new AutofacServiceProvider(builder.Build()); var lifeTimeScope = autofacServiceProvider.GetRequiredService(); var eventBusSubscriptionsManager = new InMemoryEventBusSubscriptionsManager(); @@ -168,7 +161,7 @@ public EventBusGoogleCloudPubSub CreateEventBus(string subscriptionNamePrefix = subscriptionNamePrefix, CONNECTION_INFO); var eventBusClient = new EventBusGoogleCloudPubSub( persisterConnection, - _logger, + logger, eventBusSubscriptionsManager, lifeTimeScope, new HandlerRetryBehavior { NumberOfRetries = 5, MinimumBackoff = 2, MaximumBackoff = 120 }); @@ -186,8 +179,6 @@ public void Dispose() public async ValueTask DisposeAsync() { - _logger.Dispose(); - foreach (var instance in _instances) { instance.AutofacServiceProviders.Dispose(); diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs index 41f8b56019..ba1f0f2ed7 100644 --- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs +++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs @@ -1,8 +1,10 @@ using Backbone.BuildingBlocks.Application.Abstractions.Exceptions; using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage; using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage; +using FakeItEasy; using Google.Apis.Auth.OAuth2; using Google.Cloud.Storage.V1; +using Microsoft.Extensions.Logging; using Xunit.Abstractions; namespace Backbone.BuildingBlocks.Infrastructure.Tests.Tests; @@ -19,8 +21,7 @@ public GoogleCloudStorageTests(ITestOutputHelper output) _storageClient = StorageClient.Create(GoogleCredential.FromJson(authJson)); - var logger = output.BuildLoggerFor(); - _blobStorageUnderTest = new GoogleCloudStorage(_storageClient, logger); + _blobStorageUnderTest = new GoogleCloudStorage(_storageClient, A.Fake>()); } public Task InitializeAsync() diff --git a/Common/src/Common.Infrastructure/Common.Infrastructure.csproj b/Common/src/Common.Infrastructure/Common.Infrastructure.csproj index 08c06e1310..3867aef9e3 100644 --- a/Common/src/Common.Infrastructure/Common.Infrastructure.csproj +++ b/Common/src/Common.Infrastructure/Common.Infrastructure.csproj @@ -2,7 +2,8 @@ - + + diff --git a/Directory.Build.props b/Directory.Build.props index 3db094797d..9ec8741c83 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable Backbone.$(MSBuildProjectName) $(AssemblyName.Replace(" ", "_")) @@ -21,7 +21,6 @@ - diff --git a/Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj b/Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj index 0722a0c7a8..816bd3ee91 100644 --- a/Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj +++ b/Modules/Challenges/src/Challenges.Application/Challenges.Application.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/Modules/Challenges/src/Challenges.ConsumerApi/Challenges.ConsumerApi.csproj b/Modules/Challenges/src/Challenges.ConsumerApi/Challenges.ConsumerApi.csproj index c2620ea46b..3b33b60d31 100644 --- a/Modules/Challenges/src/Challenges.ConsumerApi/Challenges.ConsumerApi.csproj +++ b/Modules/Challenges/src/Challenges.ConsumerApi/Challenges.ConsumerApi.csproj @@ -10,6 +10,6 @@ - + diff --git a/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj b/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj index 00612dc94a..d861b735f9 100644 --- a/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj +++ b/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj @@ -1,9 +1,9 @@ - - - + + + diff --git a/Modules/Challenges/src/Challenges.Jobs.Cleanup/Challenges.Jobs.Cleanup.csproj b/Modules/Challenges/src/Challenges.Jobs.Cleanup/Challenges.Jobs.Cleanup.csproj index 3c0dcaffd4..4a5425a342 100644 --- a/Modules/Challenges/src/Challenges.Jobs.Cleanup/Challenges.Jobs.Cleanup.csproj +++ b/Modules/Challenges/src/Challenges.Jobs.Cleanup/Challenges.Jobs.Cleanup.csproj @@ -5,7 +5,7 @@ - + diff --git a/Modules/Challenges/src/Challenges.Jobs.Cleanup/Dockerfile b/Modules/Challenges/src/Challenges.Jobs.Cleanup/Dockerfile index 3fac5adfa9..a75f8071b1 100644 --- a/Modules/Challenges/src/Challenges.Jobs.Cleanup/Dockerfile +++ b/Modules/Challenges/src/Challenges.Jobs.Cleanup/Dockerfile @@ -1,5 +1,5 @@ # Build -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build-env WORKDIR /src ARG VERSION @@ -11,7 +11,7 @@ WORKDIR "/src/Challenges.Jobs.Cleanup" RUN dotnet publish /p:ContinuousIntegrationBuild=true --configuration Release --output /app --no-restore # Run -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.18 +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine WORKDIR /app ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=0 RUN apk add icu-libs diff --git a/Modules/Devices/src/Devices.Application/Devices.Application.csproj b/Modules/Devices/src/Devices.Application/Devices.Application.csproj index 68aee157af..73c9988014 100644 --- a/Modules/Devices/src/Devices.Application/Devices.Application.csproj +++ b/Modules/Devices/src/Devices.Application/Devices.Application.csproj @@ -1,10 +1,11 @@ - - + + + diff --git a/Modules/Devices/src/Devices.ConsumerApi/Devices.ConsumerApi.csproj b/Modules/Devices/src/Devices.ConsumerApi/Devices.ConsumerApi.csproj index b9e2cfc12d..eb476fe66b 100644 --- a/Modules/Devices/src/Devices.ConsumerApi/Devices.ConsumerApi.csproj +++ b/Modules/Devices/src/Devices.ConsumerApi/Devices.ConsumerApi.csproj @@ -10,6 +10,6 @@ - + diff --git a/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj b/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj index 484f020ee0..a0ff58e118 100644 --- a/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj +++ b/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj b/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj index 7a6030e945..a20ab9b63f 100644 --- a/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj +++ b/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj @@ -3,19 +3,19 @@ - - - - - - + + + + + + - - + + - - + + diff --git a/Modules/Directory.Build.props b/Modules/Directory.Build.props index 617ceb09ee..dca9cd8944 100644 --- a/Modules/Directory.Build.props +++ b/Modules/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable Backbone.Modules.$(MSBuildProjectName) $(AssemblyName.Replace(" ", "_")) @@ -21,7 +21,6 @@ - diff --git a/Modules/Files/src/Files.Application/Files.Application.csproj b/Modules/Files/src/Files.Application/Files.Application.csproj index 318d7c3acb..697e04620c 100644 --- a/Modules/Files/src/Files.Application/Files.Application.csproj +++ b/Modules/Files/src/Files.Application/Files.Application.csproj @@ -1,7 +1,7 @@ - + diff --git a/Modules/Files/src/Files.ConsumerApi/Files.ConsumerApi.csproj b/Modules/Files/src/Files.ConsumerApi/Files.ConsumerApi.csproj index 1236e00837..4795c594bc 100644 --- a/Modules/Files/src/Files.ConsumerApi/Files.ConsumerApi.csproj +++ b/Modules/Files/src/Files.ConsumerApi/Files.ConsumerApi.csproj @@ -11,6 +11,6 @@ - + diff --git a/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj b/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj index 3ebeb38a67..e9d9d4f361 100644 --- a/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj +++ b/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj @@ -1,9 +1,9 @@ - - - + + + diff --git a/Modules/Files/test/Files.Domain.Tests/Files.Domain.Tests.csproj b/Modules/Files/test/Files.Domain.Tests/Files.Domain.Tests.csproj index d6ec603e51..850cb533f3 100644 --- a/Modules/Files/test/Files.Domain.Tests/Files.Domain.Tests.csproj +++ b/Modules/Files/test/Files.Domain.Tests/Files.Domain.Tests.csproj @@ -1,10 +1,6 @@ - net8.0 - enable - enable - false true diff --git a/Modules/Messages/src/Messages.Application/Messages.Application.csproj b/Modules/Messages/src/Messages.Application/Messages.Application.csproj index bb94f28a43..1401fcc4c8 100644 --- a/Modules/Messages/src/Messages.Application/Messages.Application.csproj +++ b/Modules/Messages/src/Messages.Application/Messages.Application.csproj @@ -1,7 +1,7 @@ - + diff --git a/Modules/Messages/src/Messages.Common/Messages.Common.csproj b/Modules/Messages/src/Messages.Common/Messages.Common.csproj index a966e793ce..e3737dcd56 100644 --- a/Modules/Messages/src/Messages.Common/Messages.Common.csproj +++ b/Modules/Messages/src/Messages.Common/Messages.Common.csproj @@ -1,7 +1,7 @@ - + diff --git a/Modules/Messages/src/Messages.ConsumerApi/Messages.ConsumerApi.csproj b/Modules/Messages/src/Messages.ConsumerApi/Messages.ConsumerApi.csproj index bbec8160bb..468a5fa974 100644 --- a/Modules/Messages/src/Messages.ConsumerApi/Messages.ConsumerApi.csproj +++ b/Modules/Messages/src/Messages.ConsumerApi/Messages.ConsumerApi.csproj @@ -10,7 +10,7 @@ - + diff --git a/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj b/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj index c329f2f3c4..6fceb14afd 100644 --- a/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj +++ b/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj @@ -1,9 +1,9 @@ - - - + + + diff --git a/Modules/Quotas/src/Quotas.ConsumerApi/Quotas.ConsumerApi.csproj b/Modules/Quotas/src/Quotas.ConsumerApi/Quotas.ConsumerApi.csproj index 25be057c1e..c37ca66b44 100644 --- a/Modules/Quotas/src/Quotas.ConsumerApi/Quotas.ConsumerApi.csproj +++ b/Modules/Quotas/src/Quotas.ConsumerApi/Quotas.ConsumerApi.csproj @@ -9,7 +9,7 @@ - + diff --git a/Modules/Quotas/src/Quotas.Domain/Quotas.Domain.csproj b/Modules/Quotas/src/Quotas.Domain/Quotas.Domain.csproj index 6b664ca2eb..c78f0f086f 100644 --- a/Modules/Quotas/src/Quotas.Domain/Quotas.Domain.csproj +++ b/Modules/Quotas/src/Quotas.Domain/Quotas.Domain.csproj @@ -1,7 +1,7 @@ - + diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj b/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj index 053770463c..77aefbb516 100644 --- a/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj +++ b/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj @@ -1,10 +1,10 @@ - - - - + + + + diff --git a/Modules/Relationships/src/Relationships.Application/Relationships.Application.csproj b/Modules/Relationships/src/Relationships.Application/Relationships.Application.csproj index 906035ed66..b12d8d7918 100644 --- a/Modules/Relationships/src/Relationships.Application/Relationships.Application.csproj +++ b/Modules/Relationships/src/Relationships.Application/Relationships.Application.csproj @@ -1,7 +1,7 @@  - + diff --git a/Modules/Relationships/src/Relationships.Common/Relationships.Common.csproj b/Modules/Relationships/src/Relationships.Common/Relationships.Common.csproj index a966e793ce..e3737dcd56 100644 --- a/Modules/Relationships/src/Relationships.Common/Relationships.Common.csproj +++ b/Modules/Relationships/src/Relationships.Common/Relationships.Common.csproj @@ -1,7 +1,7 @@ - + diff --git a/Modules/Relationships/src/Relationships.ConsumerApi/Relationships.ConsumerApi.csproj b/Modules/Relationships/src/Relationships.ConsumerApi/Relationships.ConsumerApi.csproj index 209ab9a646..0e9d7cc2d5 100644 --- a/Modules/Relationships/src/Relationships.ConsumerApi/Relationships.ConsumerApi.csproj +++ b/Modules/Relationships/src/Relationships.ConsumerApi/Relationships.ConsumerApi.csproj @@ -11,6 +11,6 @@ - + diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj b/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj index cd5366bf1d..05adf51867 100644 --- a/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj +++ b/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj @@ -1,9 +1,9 @@ - - - + + + diff --git a/Modules/Synchronization/src/Synchronization.Application/Synchronization.Application.csproj b/Modules/Synchronization/src/Synchronization.Application/Synchronization.Application.csproj index 31dc332274..a2400b09f5 100644 --- a/Modules/Synchronization/src/Synchronization.Application/Synchronization.Application.csproj +++ b/Modules/Synchronization/src/Synchronization.Application/Synchronization.Application.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Modules/Synchronization/src/Synchronization.ConsumerApi/Synchronization.ConsumerApi.csproj b/Modules/Synchronization/src/Synchronization.ConsumerApi/Synchronization.ConsumerApi.csproj index 1ce09e5f91..0d174825b2 100644 --- a/Modules/Synchronization/src/Synchronization.ConsumerApi/Synchronization.ConsumerApi.csproj +++ b/Modules/Synchronization/src/Synchronization.ConsumerApi/Synchronization.ConsumerApi.csproj @@ -10,6 +10,6 @@ - + diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj b/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj index c7aaf86dce..7728dcc497 100644 --- a/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj +++ b/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/Modules/Tags/src/Tags.ConsumerApi/Tags.ConsumerApi.csproj b/Modules/Tags/src/Tags.ConsumerApi/Tags.ConsumerApi.csproj index 6e4bfc38c0..2095d18fe2 100644 --- a/Modules/Tags/src/Tags.ConsumerApi/Tags.ConsumerApi.csproj +++ b/Modules/Tags/src/Tags.ConsumerApi/Tags.ConsumerApi.csproj @@ -6,6 +6,6 @@ - + diff --git a/Modules/Tags/src/Tags.Domain/Tags.Domain.csproj b/Modules/Tags/src/Tags.Domain/Tags.Domain.csproj index 3a63532952..c632161032 100644 --- a/Modules/Tags/src/Tags.Domain/Tags.Domain.csproj +++ b/Modules/Tags/src/Tags.Domain/Tags.Domain.csproj @@ -1,9 +1,3 @@  - - net8.0 - enable - enable - - diff --git a/Modules/Tags/src/Tags.Infrastructure/Tags.Infrastructure.csproj b/Modules/Tags/src/Tags.Infrastructure/Tags.Infrastructure.csproj index a027b534c3..d04c8a1be9 100644 --- a/Modules/Tags/src/Tags.Infrastructure/Tags.Infrastructure.csproj +++ b/Modules/Tags/src/Tags.Infrastructure/Tags.Infrastructure.csproj @@ -1,11 +1,5 @@  - - net8.0 - enable - enable - - diff --git a/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj b/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj index 000f55fb88..1591dd72fb 100644 --- a/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj +++ b/Modules/Tokens/src/Tokens.Application/Tokens.Application.csproj @@ -1,7 +1,8 @@ - + + diff --git a/Modules/Tokens/src/Tokens.ConsumerApi/Tokens.ConsumerApi.csproj b/Modules/Tokens/src/Tokens.ConsumerApi/Tokens.ConsumerApi.csproj index ae2b04e572..a55bc82240 100644 --- a/Modules/Tokens/src/Tokens.ConsumerApi/Tokens.ConsumerApi.csproj +++ b/Modules/Tokens/src/Tokens.ConsumerApi/Tokens.ConsumerApi.csproj @@ -10,6 +10,6 @@ - + diff --git a/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj b/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj index 0f983469d1..c69d6658b2 100644 --- a/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj +++ b/Modules/Tokens/src/Tokens.Infrastructure.Database.Postgres/Tokens.Infrastructure.Database.Postgres.csproj @@ -1,5 +1,9 @@ + + + + diff --git a/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj b/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj index 0f983469d1..c69d6658b2 100644 --- a/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj +++ b/Modules/Tokens/src/Tokens.Infrastructure.Database.SqlServer/Tokens.Infrastructure.Database.SqlServer.csproj @@ -1,5 +1,9 @@ + + + + diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj b/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj index 3394ded3ef..16fb6be2cf 100644 --- a/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj +++ b/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj @@ -1,9 +1,10 @@ - - - + + + + diff --git a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj index 27820ce7e7..9b5a39429f 100644 --- a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj +++ b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj @@ -7,6 +7,7 @@ + all diff --git a/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj b/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj index 94ca264dbd..ad1ea6f964 100644 --- a/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj +++ b/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj @@ -6,6 +6,7 @@ + all diff --git a/Sdks/ConsumerApi.Sdk/src/ConsumerApi.Sdk.csproj b/Sdks/ConsumerApi.Sdk/src/ConsumerApi.Sdk.csproj index d5eda7fda3..0bbcc3398e 100644 --- a/Sdks/ConsumerApi.Sdk/src/ConsumerApi.Sdk.csproj +++ b/Sdks/ConsumerApi.Sdk/src/ConsumerApi.Sdk.csproj @@ -1,10 +1,5 @@ - - net8.0 - enable - -