From 75e791bd8c22c6219ff22591c55c98576775cd41 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Tue, 19 May 2026 11:43:05 +1000 Subject: [PATCH] =?UTF-8?q?feat(all):=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=20netCore=209.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 10 +++++++++- PARR.AIHITLoaderWorker/Dockerfile | 4 ++-- .../PARR.AIHITLoaderWorker.csproj | 14 +++++++------- .../PARR.AIHITMainLoader.csproj | 2 +- .../PARR.AIHITMainSyncer.csproj | 2 +- .../PARR.AIHITRelationshipsSyncer.csproj | 2 +- PARR.AIHITRelationshipsSyncerWorker/Dockerfile | 4 ++-- .../PARR.AIHITRelationshipsSyncerWorker.csproj | 15 +++++++-------- PARR.AIHITSyncerWorker/Dockerfile | 4 ++-- .../PARR.AIHITSyncerWorker.csproj | 14 +++++++------- PARR.API/Dockerfile | 17 ++++++++++++----- PARR.API/PARR.API.csproj | 18 +++++++++--------- PARR.Core/PARR.Core.csproj | 8 ++++---- .../PARR.DAL.IntegrationTests.csproj | 10 +++++----- PARR.DAL.Tests/PARR.DAL.Tests.csproj | 2 +- PARR.DAL/PARR.DAL.csproj | 18 +++++++++--------- PARR.Domain/PARR.Domain.csproj | 2 +- PARR.EsppApi/PARR.EsppApi.csproj | 12 ++++++------ .../PARR.EsppOrderLoader.csproj | 2 +- PARR.EsppOrderLoaderWorker/Dockerfile | 4 ++-- .../PARR.EsppOrderLoaderWorker.csproj | 14 +++++++------- .../PARR.EsppOrderManager.csproj | 2 +- PARR.EsppOrderManagerWorker/Dockerfile | 4 ++-- .../PARR.EsppOrderManagerWorker.csproj | 14 +++++++------- .../PARR.EsppScheduleSync.csproj | 2 +- PARR.EsppScheduleSyncWorker/Dockerfile | 4 ++-- .../PARR.EsppScheduleSyncWorker.csproj | 14 +++++++------- PARR.EsppSync/PARR.EsppSync.csproj | 4 ++-- .../PARR.EsppTemplateSync.csproj | 6 +----- PARR.EsppTemplateSyncWorker/Dockerfile | 4 ++-- .../PARR.EsppTemplateSyncWorker.csproj | 14 +++++++------- PARR.Infrastructure/PARR.Infrastructure.csproj | 6 +++--- PARR.JobAutoControl/PARR.JobAutoControl.csproj | 2 +- PARR.JobAutoControlWorker/Dockerfile | 4 ++-- .../PARR.JobAutoControlWorker.csproj | 15 +++++++-------- PARR.Mail/PARR.Mail/PARR.Mail.csproj | 2 +- PARR.Master/PARR.Master.csproj | 2 +- PARR.MasterWorker/Dockerfile | 4 ++-- PARR.MasterWorker/PARR.MasterWorker.csproj | 14 +++++++------- PARR.MockData/PARR.MockData.csproj | 14 +++++++------- PARR.NextRun/PARR.NextRun.csproj | 2 +- PARR.NextRunWorker/Dockerfile | 4 ++-- PARR.NextRunWorker/PARR.NextRunWorker.csproj | 14 +++++++------- .../PARR.TaskReconciliationWorker.csproj | 14 +++++++------- .../PARR.TemplateActivator.csproj | 2 +- PARR.TemplateActivatorWorker/Dockerfile | 4 ++-- .../PARR.TemplateActivatorWorker.csproj | 15 +++++++-------- .../PARR.TemplateDistributor.csproj | 2 +- PARR.TemplateDistributorWorker/Dockerfile | 4 ++-- .../PARR.TemplateDistributorWorker.csproj | 15 +++++++-------- PARR.TemplateGeneratorWorker/Dockerfile | 4 ++-- .../PARR.TemplateGeneratorWorker.csproj | 15 +++++++-------- .../PARR.TemplateMatcher.csproj | 2 +- PARR.TemplateMatcherWorker/Dockerfile | 4 ++-- .../PARR.TemplateMatcherWorker.csproj | 14 +++++++------- .../PARR.TemplateUpdater.csproj | 2 +- PARR.TemplateUpdaterWorker/Dockerfile | 4 ++-- .../PARR.TemplateUpdaterWorker.csproj | 14 +++++++------- PARR.Test/PARR.Test.csproj | 14 +++++++------- PARR.WorkloadBuilderWorker/Dockerfile | 4 ++-- .../PARR.WorkloadBuilderWorker.csproj | 14 +++++++------- 61 files changed, 241 insertions(+), 235 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7179161..98c00860 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,15 @@ prod_build: DOCKER_TLS_CERTDIR: "" script: - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d v) - - docker build -t $REPO/$PROD_NAME_API:$CI_COMMIT_TAG -t $REPO/$PROD_NAME_API:latest -t $PROD_NAME_API:$CI_COMMIT_TAG -t $PROD_NAME_API:latest --build-arg app_version=$IMAGE_VERSION -f PARR.API/Dockerfile . + - AUTHOR=$CI_COMMIT_AUTHOR + - docker build \ + -t $REPO/$PROD_NAME_API:$CI_COMMIT_TAG \ + -t $REPO/$PROD_NAME_API:latest \ + -t $PROD_NAME_API:$CI_COMMIT_TAG \ + -t $PROD_NAME_API:latest \ + --build-arg app_version=$IMAGE_VERSION \ + --build-arg commit_author="$AUTHOR" \ + -f PARR.API/Dockerfile . - docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO - docker push --all-tags $REPO/$PROD_NAME_API tags: diff --git a/PARR.AIHITLoaderWorker/Dockerfile b/PARR.AIHITLoaderWorker/Dockerfile index c110aa4e..dfb283c3 100644 --- a/PARR.AIHITLoaderWorker/Dockerfile +++ b/PARR.AIHITLoaderWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj b/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj index 4041ff50..b4a6a712 100644 --- a/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj +++ b/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.AIHITLoaderWorker-a6f3114e-7da7-43fd-888c-f45df76de2bd @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.AIHITMainLoader/PARR.AIHITMainLoader.csproj b/PARR.AIHITMainLoader/PARR.AIHITMainLoader.csproj index 99a2c089..bab09d97 100644 --- a/PARR.AIHITMainLoader/PARR.AIHITMainLoader.csproj +++ b/PARR.AIHITMainLoader/PARR.AIHITMainLoader.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.AIHITMainSyncer/PARR.AIHITMainSyncer.csproj b/PARR.AIHITMainSyncer/PARR.AIHITMainSyncer.csproj index e8ef522a..77b0e613 100644 --- a/PARR.AIHITMainSyncer/PARR.AIHITMainSyncer.csproj +++ b/PARR.AIHITMainSyncer/PARR.AIHITMainSyncer.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.AIHITRelationshipsSyncer/PARR.AIHITRelationshipsSyncer.csproj b/PARR.AIHITRelationshipsSyncer/PARR.AIHITRelationshipsSyncer.csproj index 39fa5489..86d1269e 100644 --- a/PARR.AIHITRelationshipsSyncer/PARR.AIHITRelationshipsSyncer.csproj +++ b/PARR.AIHITRelationshipsSyncer/PARR.AIHITRelationshipsSyncer.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.AIHITRelationshipsSyncerWorker/Dockerfile b/PARR.AIHITRelationshipsSyncerWorker/Dockerfile index 09638974..7c7c855a 100644 --- a/PARR.AIHITRelationshipsSyncerWorker/Dockerfile +++ b/PARR.AIHITRelationshipsSyncerWorker/Dockerfile @@ -1,12 +1,12 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app # This stage is used to build the service project -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.AIHITRelationshipsSyncerWorker/PARR.AIHITRelationshipsSyncerWorker.csproj b/PARR.AIHITRelationshipsSyncerWorker/PARR.AIHITRelationshipsSyncerWorker.csproj index 2ad42412..47903096 100644 --- a/PARR.AIHITRelationshipsSyncerWorker/PARR.AIHITRelationshipsSyncerWorker.csproj +++ b/PARR.AIHITRelationshipsSyncerWorker/PARR.AIHITRelationshipsSyncerWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.AIHITRelationshipsSyncerWorker-529ba045-500b-4aca-9aad-871e85ded4d6 @@ -9,13 +9,12 @@ - - - - - - - + + + + + + diff --git a/PARR.AIHITSyncerWorker/Dockerfile b/PARR.AIHITSyncerWorker/Dockerfile index c3a83ca3..fa861fa3 100644 --- a/PARR.AIHITSyncerWorker/Dockerfile +++ b/PARR.AIHITSyncerWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj b/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj index 63944223..16fa2012 100644 --- a/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj +++ b/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.AIHITSyncerWorker-cd7db85e-5317-46a2-aa90-44eb3e56f076 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.API/Dockerfile b/PARR.API/Dockerfile index 9d9e43ec..0977d38f 100644 --- a/PARR.API/Dockerfile +++ b/PARR.API/Dockerfile @@ -1,17 +1,19 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/aspnet:7.0 AS base -# CURL install (bullseye - for net core 7!!!) +FROM 10.99.253.167:8090/dotnet/aspnet:9.0 AS base +# CURL install (bullseye - for net core 7, bookworm - for net core 9 !!!) RUN rm -f /etc/apt/sources.list.d/* && \ - echo "deb [trusted=yes] http://10.99.253.167:8081/repository/apt-proxy bullseye main" > /etc/apt/sources.list && \ - echo "deb [trusted=yes] http://10.99.253.167:8081/repository/apt-proxy bullseye-updates main" >> /etc/apt/sources.list && \ + echo "deb [trusted=yes] http://10.99.253.167:8081/repository/apt-proxy bookworm main" > /etc/apt/sources.list && \ + echo "deb [trusted=yes] http://10.99.253.167:8081/repository/apt-proxy bookworm-updates main" >> /etc/apt/sources.list && \ apt-get update && \ apt-get install -y curl && \ rm -rf /var/lib/apt/lists/* WORKDIR /app + +ENV ASPNETCORE_HTTP_PORTS=80 EXPOSE 80 -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["NuGet.config", "."] COPY ["PARR.API/PARR.API.csproj", "PARR.API/"] @@ -31,6 +33,11 @@ RUN dotnet publish "PARR.API.csproj" -c Release -o /app/publish /p:UseAppHost=fa COPY --from=build /src/PARR.API/CHANGELOG.md /app/publish/wwwroot/ FROM base AS final + +#author +ARG commit_author=unknown +LABEL org.opencontainers.image.authors=$commit_author + WORKDIR /app COPY --from=publish /app/publish . ENTRYPOINT ["dotnet", "PARR.API.dll"] diff --git a/PARR.API/PARR.API.csproj b/PARR.API/PARR.API.csproj index 5a561191..32d87361 100644 --- a/PARR.API/PARR.API.csproj +++ b/PARR.API/PARR.API.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable True @@ -19,19 +19,19 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/PARR.Core/PARR.Core.csproj b/PARR.Core/PARR.Core.csproj index 6b9219aa..a0e51996 100644 --- a/PARR.Core/PARR.Core.csproj +++ b/PARR.Core/PARR.Core.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable @@ -10,9 +10,9 @@ - - - + + + diff --git a/PARR.DAL.IntegrationTests/PARR.DAL.IntegrationTests.csproj b/PARR.DAL.IntegrationTests/PARR.DAL.IntegrationTests.csproj index 284a20a7..d137f3f8 100644 --- a/PARR.DAL.IntegrationTests/PARR.DAL.IntegrationTests.csproj +++ b/PARR.DAL.IntegrationTests/PARR.DAL.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net10.0 + net9.0 enable enable false @@ -10,11 +10,11 @@ - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/PARR.DAL.Tests/PARR.DAL.Tests.csproj b/PARR.DAL.Tests/PARR.DAL.Tests.csproj index 53184a30..8867774e 100644 --- a/PARR.DAL.Tests/PARR.DAL.Tests.csproj +++ b/PARR.DAL.Tests/PARR.DAL.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.DAL/PARR.DAL.csproj b/PARR.DAL/PARR.DAL.csproj index f7b981c5..c2efc3ca 100644 --- a/PARR.DAL/PARR.DAL.csproj +++ b/PARR.DAL/PARR.DAL.csproj @@ -1,21 +1,21 @@  - net7.0 + net9.0 enable enable - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/PARR.Domain/PARR.Domain.csproj b/PARR.Domain/PARR.Domain.csproj index 49e7037b..e405ce10 100644 --- a/PARR.Domain/PARR.Domain.csproj +++ b/PARR.Domain/PARR.Domain.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.EsppApi/PARR.EsppApi.csproj b/PARR.EsppApi/PARR.EsppApi.csproj index cdfa269e..90880955 100644 --- a/PARR.EsppApi/PARR.EsppApi.csproj +++ b/PARR.EsppApi/PARR.EsppApi.csproj @@ -1,17 +1,17 @@ - net7.0 + net9.0 enable enable - - - - - + + + + + diff --git a/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj b/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj index effd3667..37c58ef1 100644 --- a/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj +++ b/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.EsppOrderLoaderWorker/Dockerfile b/PARR.EsppOrderLoaderWorker/Dockerfile index 90b21c80..446e8bf9 100644 --- a/PARR.EsppOrderLoaderWorker/Dockerfile +++ b/PARR.EsppOrderLoaderWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["NuGet.config", "."] COPY ["PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj", "PARR.EsppOrderLoaderWorker/"] diff --git a/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj b/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj index 7086fc23..5ddb7d05 100644 --- a/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj +++ b/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.EsppOrderLoaderWorker-9450cc7f-81ad-4405-8442-7d14419c7952 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj b/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj index effd3667..37c58ef1 100644 --- a/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj +++ b/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.EsppOrderManagerWorker/Dockerfile b/PARR.EsppOrderManagerWorker/Dockerfile index 1cc76fc7..aaef1677 100644 --- a/PARR.EsppOrderManagerWorker/Dockerfile +++ b/PARR.EsppOrderManagerWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["NuGet.config", "."] COPY ["PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj", "PARR.EsppOrderManagerWorker/"] diff --git a/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj b/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj index 20eb6b2f..90a16dde 100644 --- a/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj +++ b/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.EsppOrderManagerWorker-a4ce7a82-5723-4e74-87e1-eca04735f524 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.EsppScheduleSync/PARR.EsppScheduleSync.csproj b/PARR.EsppScheduleSync/PARR.EsppScheduleSync.csproj index 6fe72632..239c7520 100644 --- a/PARR.EsppScheduleSync/PARR.EsppScheduleSync.csproj +++ b/PARR.EsppScheduleSync/PARR.EsppScheduleSync.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.EsppScheduleSyncWorker/Dockerfile b/PARR.EsppScheduleSyncWorker/Dockerfile index 9c20332e..6b3e85ed 100644 --- a/PARR.EsppScheduleSyncWorker/Dockerfile +++ b/PARR.EsppScheduleSyncWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["NuGet.config", "."] COPY ["PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj", "PARR.EsppScheduleSyncWorker/"] diff --git a/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj b/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj index 0e363f7b..38a2367e 100644 --- a/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj +++ b/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.EsppScheduleSyncWorker-30fab400-2a4f-412e-ad4d-ec19f45d7c50 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.EsppSync/PARR.EsppSync.csproj b/PARR.EsppSync/PARR.EsppSync.csproj index 52abd3ef..717199b3 100644 --- a/PARR.EsppSync/PARR.EsppSync.csproj +++ b/PARR.EsppSync/PARR.EsppSync.csproj @@ -1,13 +1,13 @@ - net7.0 + net9.0 enable enable - + diff --git a/PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj b/PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj index 279a46e0..e99c99d9 100644 --- a/PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj +++ b/PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj @@ -1,15 +1,11 @@ - net7.0 + net9.0 enable enable - - - - diff --git a/PARR.EsppTemplateSyncWorker/Dockerfile b/PARR.EsppTemplateSyncWorker/Dockerfile index 5a379576..36d7184b 100644 --- a/PARR.EsppTemplateSyncWorker/Dockerfile +++ b/PARR.EsppTemplateSyncWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["NuGet.config", "."] COPY ["PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj", "PARR.EsppTemplateSyncWorker/"] diff --git a/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj b/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj index 4bde810e..d8ca99da 100644 --- a/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj +++ b/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.EsppTemplateSyncWorker-33871a7f-fda7-4371-a369-a7ce886efbec @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.Infrastructure/PARR.Infrastructure.csproj b/PARR.Infrastructure/PARR.Infrastructure.csproj index 303ef51b..d05b29d1 100644 --- a/PARR.Infrastructure/PARR.Infrastructure.csproj +++ b/PARR.Infrastructure/PARR.Infrastructure.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable @@ -9,8 +9,8 @@ - - + + diff --git a/PARR.JobAutoControl/PARR.JobAutoControl.csproj b/PARR.JobAutoControl/PARR.JobAutoControl.csproj index e8ef522a..77b0e613 100644 --- a/PARR.JobAutoControl/PARR.JobAutoControl.csproj +++ b/PARR.JobAutoControl/PARR.JobAutoControl.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.JobAutoControlWorker/Dockerfile b/PARR.JobAutoControlWorker/Dockerfile index 814557a4..79799ea3 100644 --- a/PARR.JobAutoControlWorker/Dockerfile +++ b/PARR.JobAutoControlWorker/Dockerfile @@ -1,12 +1,12 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app # This stage is used to build the service project -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj b/PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj index afdb4746..d9d5b516 100644 --- a/PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj +++ b/PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.JobAutoControlWorker-50dc4ed1-928f-47c3-855e-137f03acd19c @@ -9,13 +9,12 @@ - - - - - - - + + + + + + diff --git a/PARR.Mail/PARR.Mail/PARR.Mail.csproj b/PARR.Mail/PARR.Mail/PARR.Mail.csproj index 65e69bd1..89b0e3dd 100644 --- a/PARR.Mail/PARR.Mail/PARR.Mail.csproj +++ b/PARR.Mail/PARR.Mail/PARR.Mail.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.Master/PARR.Master.csproj b/PARR.Master/PARR.Master.csproj index e8ef522a..77b0e613 100644 --- a/PARR.Master/PARR.Master.csproj +++ b/PARR.Master/PARR.Master.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.MasterWorker/Dockerfile b/PARR.MasterWorker/Dockerfile index a7f545fc..4af96c5d 100644 --- a/PARR.MasterWorker/Dockerfile +++ b/PARR.MasterWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["NuGet.config", "."] COPY ["PARR.MasterWorker/PARR.MasterWorker.csproj", "PARR.MasterWorker/"] diff --git a/PARR.MasterWorker/PARR.MasterWorker.csproj b/PARR.MasterWorker/PARR.MasterWorker.csproj index 0ce2b50f..4d782437 100644 --- a/PARR.MasterWorker/PARR.MasterWorker.csproj +++ b/PARR.MasterWorker/PARR.MasterWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.MasterWorker-55f789f6-6e2b-42fa-b92e-3e56c1142316 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.MockData/PARR.MockData.csproj b/PARR.MockData/PARR.MockData.csproj index ec3023c3..39aa1066 100644 --- a/PARR.MockData/PARR.MockData.csproj +++ b/PARR.MockData/PARR.MockData.csproj @@ -2,18 +2,18 @@ Exe - net7.0 + net9.0 enable enable - - - - - - + + + + + + diff --git a/PARR.NextRun/PARR.NextRun.csproj b/PARR.NextRun/PARR.NextRun.csproj index fe01bb25..c7576894 100644 --- a/PARR.NextRun/PARR.NextRun.csproj +++ b/PARR.NextRun/PARR.NextRun.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.NextRunWorker/Dockerfile b/PARR.NextRunWorker/Dockerfile index 707492f8..713260d7 100644 --- a/PARR.NextRunWorker/Dockerfile +++ b/PARR.NextRunWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.NextRunWorker/PARR.NextRunWorker.csproj b/PARR.NextRunWorker/PARR.NextRunWorker.csproj index c8e32ab2..bc2c034b 100644 --- a/PARR.NextRunWorker/PARR.NextRunWorker.csproj +++ b/PARR.NextRunWorker/PARR.NextRunWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.NextRunWorker-a622ce44-5924-404c-b214-4dcbdba3aca3 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.TaskReconciliationWorker/PARR.TaskReconciliationWorker.csproj b/PARR.TaskReconciliationWorker/PARR.TaskReconciliationWorker.csproj index 01235ea1..43fad45f 100644 --- a/PARR.TaskReconciliationWorker/PARR.TaskReconciliationWorker.csproj +++ b/PARR.TaskReconciliationWorker/PARR.TaskReconciliationWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.TaskReconciliationWorker-90386488-d496-4f4d-8dcd-7dcc50882876 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.TemplateActivator/PARR.TemplateActivator.csproj b/PARR.TemplateActivator/PARR.TemplateActivator.csproj index e8ef522a..77b0e613 100644 --- a/PARR.TemplateActivator/PARR.TemplateActivator.csproj +++ b/PARR.TemplateActivator/PARR.TemplateActivator.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.TemplateActivatorWorker/Dockerfile b/PARR.TemplateActivatorWorker/Dockerfile index 4cb3f451..67733d7f 100644 --- a/PARR.TemplateActivatorWorker/Dockerfile +++ b/PARR.TemplateActivatorWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj b/PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj index df984141..44f20ab2 100644 --- a/PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj +++ b/PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.TemplateActivatorWorker-99abde53-965d-477c-abdc-38f4544cfd05 @@ -9,13 +9,12 @@ - - - - - - - + + + + + + diff --git a/PARR.TemplateDistributor/PARR.TemplateDistributor.csproj b/PARR.TemplateDistributor/PARR.TemplateDistributor.csproj index e8ef522a..77b0e613 100644 --- a/PARR.TemplateDistributor/PARR.TemplateDistributor.csproj +++ b/PARR.TemplateDistributor/PARR.TemplateDistributor.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.TemplateDistributorWorker/Dockerfile b/PARR.TemplateDistributorWorker/Dockerfile index cb65aa2b..92f9b6a4 100644 --- a/PARR.TemplateDistributorWorker/Dockerfile +++ b/PARR.TemplateDistributorWorker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj b/PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj index 2f098384..de7d8cfc 100644 --- a/PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj +++ b/PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.TemplateDistributorWorker-ec6016b0-eb25-4847-b0cf-a0ca10a6f6e2 @@ -9,13 +9,12 @@ - - - - - - - + + + + + + diff --git a/PARR.TemplateGeneratorWorker/Dockerfile b/PARR.TemplateGeneratorWorker/Dockerfile index 2c69f096..23f3e135 100644 --- a/PARR.TemplateGeneratorWorker/Dockerfile +++ b/PARR.TemplateGeneratorWorker/Dockerfile @@ -1,12 +1,12 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app # This stage is used to build the service project -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.TemplateGeneratorWorker/PARR.TemplateGeneratorWorker.csproj b/PARR.TemplateGeneratorWorker/PARR.TemplateGeneratorWorker.csproj index ba188d68..9f465c49 100644 --- a/PARR.TemplateGeneratorWorker/PARR.TemplateGeneratorWorker.csproj +++ b/PARR.TemplateGeneratorWorker/PARR.TemplateGeneratorWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.TemplateGeneratorWorker-4ea24dbb-6876-46db-9b6e-68e93850120e @@ -9,13 +9,12 @@ - - - - - - - + + + + + + diff --git a/PARR.TemplateMatcher/PARR.TemplateMatcher.csproj b/PARR.TemplateMatcher/PARR.TemplateMatcher.csproj index 6f3fde69..108704d2 100644 --- a/PARR.TemplateMatcher/PARR.TemplateMatcher.csproj +++ b/PARR.TemplateMatcher/PARR.TemplateMatcher.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.TemplateMatcherWorker/Dockerfile b/PARR.TemplateMatcherWorker/Dockerfile index b77284db..21b2cd0a 100644 --- a/PARR.TemplateMatcherWorker/Dockerfile +++ b/PARR.TemplateMatcherWorker/Dockerfile @@ -1,12 +1,12 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app # This stage is used to build the service project -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj b/PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj index 95d8f186..999db17e 100644 --- a/PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj +++ b/PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.TemplateMatcherWorker-5320c017-a02a-449c-9b4a-13adca2c3558 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.TemplateUpdater/PARR.TemplateUpdater.csproj b/PARR.TemplateUpdater/PARR.TemplateUpdater.csproj index 6f3fde69..108704d2 100644 --- a/PARR.TemplateUpdater/PARR.TemplateUpdater.csproj +++ b/PARR.TemplateUpdater/PARR.TemplateUpdater.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable diff --git a/PARR.TemplateUpdaterWorker/Dockerfile b/PARR.TemplateUpdaterWorker/Dockerfile index 385379e5..0f996b42 100644 --- a/PARR.TemplateUpdaterWorker/Dockerfile +++ b/PARR.TemplateUpdaterWorker/Dockerfile @@ -1,12 +1,12 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app # This stage is used to build the service project -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.TemplateUpdaterWorker/PARR.TemplateUpdaterWorker.csproj b/PARR.TemplateUpdaterWorker/PARR.TemplateUpdaterWorker.csproj index dd77a465..1036e78f 100644 --- a/PARR.TemplateUpdaterWorker/PARR.TemplateUpdaterWorker.csproj +++ b/PARR.TemplateUpdaterWorker/PARR.TemplateUpdaterWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.TemplateUpdaterWorker-413e055b-7f45-4b87-bbb3-28a3427d03f2 @@ -9,13 +9,13 @@ - - + + - - - - + + + + diff --git a/PARR.Test/PARR.Test.csproj b/PARR.Test/PARR.Test.csproj index 52c3c37f..627afcda 100644 --- a/PARR.Test/PARR.Test.csproj +++ b/PARR.Test/PARR.Test.csproj @@ -1,19 +1,19 @@ - net7.0 + net9.0 enable enable dotnet-PARR.Test-4ed55577-3528-48f9-99c8-33eb108a33bb - - - - - - + + + + + + diff --git a/PARR.WorkloadBuilderWorker/Dockerfile b/PARR.WorkloadBuilderWorker/Dockerfile index de02d494..949851ba 100644 --- a/PARR.WorkloadBuilderWorker/Dockerfile +++ b/PARR.WorkloadBuilderWorker/Dockerfile @@ -1,12 +1,12 @@ # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # This stage is used when running from VS in fast mode (Default for Debug configuration) -FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base +FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base WORKDIR /app # This stage is used to build the service project -FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build +FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["NuGet.config", "."] diff --git a/PARR.WorkloadBuilderWorker/PARR.WorkloadBuilderWorker.csproj b/PARR.WorkloadBuilderWorker/PARR.WorkloadBuilderWorker.csproj index 6201a87b..0f94b6c2 100644 --- a/PARR.WorkloadBuilderWorker/PARR.WorkloadBuilderWorker.csproj +++ b/PARR.WorkloadBuilderWorker/PARR.WorkloadBuilderWorker.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable enable dotnet-PARR.WorkloadBuilderWorker-5cefb704-873b-40e7-b8a0-0537ca29e5ed @@ -9,13 +9,13 @@ - - + + - - - - + + + +