From bdbd9ee8a9f6bc98036204e85d20652d1ffd63ca Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Tue, 6 Feb 2024 17:56:14 +0100 Subject: [PATCH] fix(nuget): adjust docker images Refs: CPLP-3400 --- docker/Dockerfile-maintenance-service | 4 +- docker/Dockerfile-portal-migrations | 2 +- .../Framework.Async/Framework.Async.csproj | 4 - .../Framework.Cors/Framework.Cors.csproj | 4 - .../Framework.DBAccess.csproj | 4 - .../Framework.DateTimeProvider.csproj | 4 - .../Framework.DependencyInjection.csproj | 4 - .../Framework.ErrorHandling.Web.csproj | 161 ++++++++--------- .../Framework.ErrorHandling.csproj | 142 ++++++++------- .../Framework.HttpClientExtensions.csproj | 5 - .../Framework.IO/Framework.IO.csproj | 5 - .../Framework.Linq/Framework.Linq.csproj | 149 ++++++++-------- .../Framework.Logging.csproj | 5 - .../Framework.Models/Framework.Models.csproj | 6 +- .../Framework.Seeding.csproj | 6 +- .../Framework.Swagger.csproj | 5 - .../Framework.Token/Framework.Token.csproj | 5 - .../Framework.Web/Framework.Web.csproj | 167 +++++++++--------- 18 files changed, 305 insertions(+), 377 deletions(-) diff --git a/docker/Dockerfile-maintenance-service b/docker/Dockerfile-maintenance-service index 584538856f..044cb8a853 100644 --- a/docker/Dockerfile-maintenance-service +++ b/docker/Dockerfile-maintenance-service @@ -31,8 +31,8 @@ COPY src/framework/Framework.Models/ src/framework/Framework.Models/ COPY src/framework/Framework.Logging/ src/framework/Framework.Logging/ COPY src/framework/Framework.Seeding/ src/framework/Framework.Seeding/ COPY src/framework/Framework.ErrorHandling/ src/framework/Framework.ErrorHandling/ -COPY src/web/Web.Identity/ src/web/Web.Identity/ -COPY /src/framework/Framework.DateTimeProvider /src/framework/Framework.DateTimeProvider +COPY src/framework/Framework.DateTimeProvider/ src/framework/Framework.DateTimeProvider/ +COPY src/processes/Processes.ProcessIdentity/ src/processes/Processes.ProcessIdentity/ RUN dotnet restore "src/maintenance/Maintenance.App/Maintenance.App.csproj" WORKDIR /src/maintenance/Maintenance.App RUN dotnet publish "Maintenance.App.csproj" -c Release -o /app/publish diff --git a/docker/Dockerfile-portal-migrations b/docker/Dockerfile-portal-migrations index 4a9df88c31..fef7fcf617 100644 --- a/docker/Dockerfile-portal-migrations +++ b/docker/Dockerfile-portal-migrations @@ -28,9 +28,9 @@ COPY /src/framework/Framework.Logging /src/framework/Framework.Logging COPY /src/framework/Framework.Models /src/framework/Framework.Models COPY /src/framework/Framework.Linq /src/framework/Framework.Linq COPY /src/framework/Framework.ErrorHandling /src/framework/Framework.ErrorHandling -COPY /src/web/Web.Identity /src/web/Web.Identity/ COPY /src/framework/Framework.Seeding /src/framework/Framework.Seeding COPY /src/framework/Framework.DateTimeProvider /src/framework/Framework.DateTimeProvider +COPY /src/processes/Processes.ProcessIdentity/ /src/processes/Processes.ProcessIdentity/ WORKDIR /src/portalbackend/PortalBackend.Migrations RUN dotnet publish "PortalBackend.Migrations.csproj" -c Release -o /migrations/publish diff --git a/src/framework/Framework.Async/Framework.Async.csproj b/src/framework/Framework.Async/Framework.Async.csproj index dea78c4165..06c99ecad2 100644 --- a/src/framework/Framework.Async/Framework.Async.csproj +++ b/src/framework/Framework.Async/Framework.Async.csproj @@ -57,8 +57,4 @@ - - - true - diff --git a/src/framework/Framework.Cors/Framework.Cors.csproj b/src/framework/Framework.Cors/Framework.Cors.csproj index 79491dabd5..fb717897e9 100644 --- a/src/framework/Framework.Cors/Framework.Cors.csproj +++ b/src/framework/Framework.Cors/Framework.Cors.csproj @@ -68,8 +68,4 @@ - - - true - diff --git a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj index 2311b218f9..c30e1a39d0 100644 --- a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj +++ b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj @@ -63,8 +63,4 @@ - - - true - diff --git a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj index a5a2e918e6..6b511db7f3 100644 --- a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj +++ b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj @@ -64,8 +64,4 @@ - - - true - diff --git a/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj b/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj index 6564a86600..4c76a8d02e 100644 --- a/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj +++ b/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj @@ -66,8 +66,4 @@ - - true - - diff --git a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj index 9b8d670527..9696d70cda 100644 --- a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj +++ b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj @@ -1,83 +1,78 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web - Eclipse Tractus-X - All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. - - The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. - This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. - - README.md - LICENSE - https://github.com/eclipse-tractusx/portal-backend - https://github.com/eclipse-tractusx/portal-backend - git - - true - - - true - - - true - snupkg - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web + net7.0 + enable + enable + true + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web + Eclipse Tractus-X + All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. + + The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. + This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. + + README.md + LICENSE + https://github.com/eclipse-tractusx/portal-backend + https://github.com/eclipse-tractusx/portal-backend + git + + true + + + true + + + true + snupkg + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj b/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj index 8739d99dd4..f5e2e8c5f4 100644 --- a/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj +++ b/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj @@ -1,73 +1,69 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling - Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling - Eclipse Tractus-X - All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. - - The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. - This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. - - README.md - LICENSE - https://github.com/eclipse-tractusx/portal-backend - https://github.com/eclipse-tractusx/portal-backend - git - - true - - - true - - - true - snupkg - - - - - - - - - - - - - - - - true - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling + net7.0 + enable + enable + true + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling + Eclipse Tractus-X + All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. + + The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. + This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. + + README.md + LICENSE + https://github.com/eclipse-tractusx/portal-backend + https://github.com/eclipse-tractusx/portal-backend + git + + true + + + true + + + true + snupkg + + + + + + + + + + + + + + + diff --git a/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj b/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj index c37edd0980..ac34851320 100644 --- a/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj +++ b/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj @@ -65,15 +65,10 @@ - - - true - - diff --git a/src/framework/Framework.IO/Framework.IO.csproj b/src/framework/Framework.IO/Framework.IO.csproj index 79d6072fe9..761893b6df 100644 --- a/src/framework/Framework.IO/Framework.IO.csproj +++ b/src/framework/Framework.IO/Framework.IO.csproj @@ -62,7 +62,6 @@ - @@ -70,8 +69,4 @@ - - true - - diff --git a/src/framework/Framework.Linq/Framework.Linq.csproj b/src/framework/Framework.Linq/Framework.Linq.csproj index 8eb8223cae..7d9a4a27a1 100644 --- a/src/framework/Framework.Linq/Framework.Linq.csproj +++ b/src/framework/Framework.Linq/Framework.Linq.csproj @@ -1,77 +1,72 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Linq - Org.Eclipse.TractusX.Portal.Backend.Framework.Linq - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Linq - Org.Eclipse.TractusX.Portal.Backend.Framework.Linq - Eclipse Tractus-X - All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. - - The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. - This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. - - README.md - LICENSE - https://github.com/eclipse-tractusx/portal-backend - https://github.com/eclipse-tractusx/portal-backend - git - - true - - - true - - - true - snupkg - - - - - - - - - - - - - - - - - - - - - true - - - + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.Linq + Org.Eclipse.TractusX.Portal.Backend.Framework.Linq + net7.0 + enable + enable + true + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.Linq + Org.Eclipse.TractusX.Portal.Backend.Framework.Linq + Eclipse Tractus-X + All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. + + The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. + This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. + + README.md + LICENSE + https://github.com/eclipse-tractusx/portal-backend + https://github.com/eclipse-tractusx/portal-backend + git + + true + + + true + + + true + snupkg + + + + + + + + + + + + + + + + + + + diff --git a/src/framework/Framework.Logging/Framework.Logging.csproj b/src/framework/Framework.Logging/Framework.Logging.csproj index 6af7967c0a..6e10f270ef 100644 --- a/src/framework/Framework.Logging/Framework.Logging.csproj +++ b/src/framework/Framework.Logging/Framework.Logging.csproj @@ -64,7 +64,6 @@ - @@ -75,8 +74,4 @@ - - true - - diff --git a/src/framework/Framework.Models/Framework.Models.csproj b/src/framework/Framework.Models/Framework.Models.csproj index 0e1b1a7558..2faaf77964 100644 --- a/src/framework/Framework.Models/Framework.Models.csproj +++ b/src/framework/Framework.Models/Framework.Models.csproj @@ -66,7 +66,7 @@ - + @@ -74,8 +74,4 @@ - - true - - diff --git a/src/framework/Framework.Seeding/Framework.Seeding.csproj b/src/framework/Framework.Seeding/Framework.Seeding.csproj index f335a8a004..8f3daf10d2 100644 --- a/src/framework/Framework.Seeding/Framework.Seeding.csproj +++ b/src/framework/Framework.Seeding/Framework.Seeding.csproj @@ -72,7 +72,7 @@ - + @@ -80,8 +80,4 @@ - - true - - diff --git a/src/framework/Framework.Swagger/Framework.Swagger.csproj b/src/framework/Framework.Swagger/Framework.Swagger.csproj index 55002d3186..ae8ec48102 100644 --- a/src/framework/Framework.Swagger/Framework.Swagger.csproj +++ b/src/framework/Framework.Swagger/Framework.Swagger.csproj @@ -62,7 +62,6 @@ - @@ -70,8 +69,4 @@ - - true - - diff --git a/src/framework/Framework.Token/Framework.Token.csproj b/src/framework/Framework.Token/Framework.Token.csproj index ff470afc46..5ef49e4e85 100644 --- a/src/framework/Framework.Token/Framework.Token.csproj +++ b/src/framework/Framework.Token/Framework.Token.csproj @@ -67,11 +67,6 @@ - - - true - - diff --git a/src/framework/Framework.Web/Framework.Web.csproj b/src/framework/Framework.Web/Framework.Web.csproj index ba1ca205ce..b0658c47be 100644 --- a/src/framework/Framework.Web/Framework.Web.csproj +++ b/src/framework/Framework.Web/Framework.Web.csproj @@ -1,86 +1,81 @@ - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Web - Org.Eclipse.TractusX.Portal.Backend.Framework.Web - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Web - Org.Eclipse.TractusX.Portal.Backend.Framework.Web - Eclipse Tractus-X - All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. - - The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. - This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. - - README.md - LICENSE - https://github.com/eclipse-tractusx/portal-backend - https://github.com/eclipse-tractusx/portal-backend - git - - true - - - true - - - true - snupkg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.Web + Org.Eclipse.TractusX.Portal.Backend.Framework.Web + net7.0 + enable + enable + true + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.Web + Org.Eclipse.TractusX.Portal.Backend.Framework.Web + Eclipse Tractus-X + All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. + + The Catena-X Portal Backend Framework library is a versatile .NET library that provides a set of powerful tools and utilities for common development tasks. + This package simplifies various aspects of your application, including database interactions, asynchronous programming, file I/O, LINQ operations, logging, and database seeding. + + README.md + LICENSE + https://github.com/eclipse-tractusx/portal-backend + https://github.com/eclipse-tractusx/portal-backend + git + + true + + + true + + + true + snupkg + + + + + + + + + + + + + + + + + + + + + + + + + + + + +