revert: framework nuget packages

.github/workflows/administration-service.yml

@@ -31,7 +31,6 @@ on:
       - 'src/notifications/**'
       - 'src/portalbackend/**'
       - 'src/provisioning/**'
-      - 'src/web/**'
       # workflow file
       - '.github/workflows/administration-service.yml'
       # dockerfile

.github/workflows/maintenance-service.yml

@@ -23,8 +23,8 @@ on:
   push:
     paths:
       # service and transitive paths
-      - 'src/framework/**'
       - 'src/maintenance/Maintenance.App/**'
+      - 'src/framework/**'
       - 'src/portalbackend/PortalBackend.PortalEntities/**'
       # workflow file
       - '.github/workflows/maintenance-service.yml'

.github/workflows/marketplace-app-service.yml

@@ -24,13 +24,11 @@ on:
     paths:
       # service and transitive paths
       - 'src/marketplace/Apps.Service/**'
-      - 'src/marketplace/Offers.Library/**'
       - 'src/framework/**'
       - 'src/keycloak/**'
       - 'src/mailing/**'
       - 'src/notifications/**'
       - 'src/portalbackend/**'
-      - 'src/web/**'
       # workflow file
       - '.github/workflows/marketplace-app-service.yml'
       # dockerfile

.github/workflows/notification-service.yml

@@ -27,7 +27,6 @@ on:
       - 'src/framework/**'
       - 'src/keycloak/**'
       - 'src/portalbackend/**'
-      - 'src/web/**'
       # workflow file
       - '.github/workflows/notification-service.yml'
       # dockerfile

.github/workflows/processes-worker.yml

@@ -23,14 +23,13 @@ on:
   push:
     paths:
       # service and transitive paths
-      - 'src/framework/**'
-      - 'src/processes/Processes.ProcessIdentity/**'
       - 'src/processes/Processes.Worker/**'
       - 'src/processes/ApplicationChecklist.Library/**'
       - 'src/processes/ApplicationChecklist.Executor/**'
       - 'src/processes/NetworkRegistration.Library/**'
       - 'src/processes/NetworkRegistration.Executor/**'
       - 'src/externalsystems/**'
+      - 'src/framework/**'
       - 'src/portalbackend/PortalBackend.PortalEntities/**'
       # workflow file
       - '.github/workflows/processes-worker.yml'

.github/workflows/registration-service.yml

@@ -23,13 +23,12 @@ on:
   push:
     paths:
       # service and transitive paths
-      - 'src/framework/**'
       - 'src/registration/**'
+      - 'src/framework/**'
       - 'src/keycloak/**'
       - 'src/mailing/**'
       - 'src/portalbackend/**'
       - 'src/provisioning/**'
-      - 'src/web/**'
       # workflow file
       - '.github/workflows/registration-service.yml'
       # dockerfile

.github/workflows/services-service.yml

@@ -23,13 +23,12 @@ on:
   push:
     paths:
       # service and transitive paths
-      - 'src/framework/**'
       - 'src/marketplace/Services.Service/**'
       - 'src/marketplace/Offers.Library/**'
+      - 'src/framework/**'
       - 'src/keycloak/**'
       - 'src/notifications/**'
       - 'src/portalbackend/**'
-      - 'src/web/**'
       # workflow file
       - '.github/workflows/services-service.yml'
       # dockerfile

.github/workflows/pre-checks.yml → .github/workflows/unit.tests-formatting.yml

@@ -1,5 +1,5 @@
 ###############################################################
-# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -17,9 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
-# This workflow builds all services and related projects, checks the formatting and if all tests are passing.
-# If framework related code changed, all steps mentioned above will happen for framework related code as well as a check for a version update of the nuget packages will be made
-name: Pre Checks
+name: Unit-Tests and Formatting
 
 on:
   push:
@@ -29,32 +27,15 @@ on:
   workflow_dispatch:
 
 jobs:
-
-  changes:
-    name: Get changed paths
-    runs-on: ubuntu-latest
-    outputs:
-      framework: ${{ steps.changes.outputs.framework }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - uses: dorny/paths-filter@v2
-        id: changes
-        with:
-          filters: |
-            framework:
-              - 'src/framework/**'
+  build:
 
-  checkServices:
-    name: Build, check and test services
     runs-on: ubuntu-latest
     strategy:
       matrix:
         dotnet-version: ['7.0']
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
         uses: actions/setup-dotnet@v2
         with:
@@ -69,27 +50,3 @@ jobs:
         run: dotnet format src --verify-no-changes --no-restore
       - name: Test
         run: dotnet test src --filter FullyQualifiedName\!~Org.Eclipse.TractusX.Portal.Backend.EndToEnd.Tests --no-restore --verbosity normal
-
-  checkFramework:
-    name: Check nuget packages
-    needs: changes
-    if: ${{ needs.changes.outputs.framework == 'true' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Check Package Versions
-        shell: bash
-        run: |
-          script_output=$(./scripts/nuget_version_check.sh origin/${{ github.event.pull_request.base.ref }})
-
-          if [ -z "$script_output" ]; then
-            echo "Expected version updates were made"
-          else
-            echo "the following packages need a version update:"
-            echo "$script_output"
-            echo "Please see https://github.com/eclipse-tractusx/portal-backend/blob/main/src/framework/README.md for further information"
-            exit 1
-          fi

DEPENDENCIES

@@ -40,11 +40,9 @@ nuget/nuget/-/Serilog.Extensions.Hosting/7.0.0, Apache-2.0, approved, #10078
 nuget/nuget/-/Serilog.Extensions.Logging/7.0.0, Apache-2.0, approved, #10070
 nuget/nuget/-/Serilog.Formatting.Compact/1.1.0, Apache-2.0, approved, #11115
 nuget/nuget/-/Serilog.Settings.Configuration/7.0.0, Apache-2.0, approved, #10069
-nuget/nuget/-/Serilog.Sinks.Console/4.0.1, Apache-2.0, approved, #12858
 nuget/nuget/-/Serilog.Sinks.Console/4.1.0, Apache-2.0, approved, #8434
 nuget/nuget/-/Serilog.Sinks.Debug/2.0.0, Apache-2.0, approved, clearlydefined
 nuget/nuget/-/Serilog.Sinks.File/5.0.0, Apache-2.0, approved, #11116
-nuget/nuget/-/Serilog/2.12.0, Apache-2.0, approved, #8435
 nuget/nuget/-/Serilog/3.0.1, Apache-2.0, approved, #10063
 nuget/nuget/-/SharpZipLib/1.4.2, MIT AND GFDL-1.3-or-later AND (Apache-2.0 AND MIT) AND WTFPL AND bzip2-1.0.6 AND LicenseRef-Permissive-license-with-conditions AND LicenseRef-Permission-Notice, approved, #10058
 nuget/nuget/-/SshNet.Security.Cryptography/1.3.0, MIT, approved, clearlydefined

README.md

@@ -36,15 +36,15 @@ This application provides container images for demonstration purposes.
 
 ### DockerHub
 
-* [portal-registration-service](https://hub.docker.com/r/tractusx/portal-registration-service)
-* [portal-administration-service](https://hub.docker.com/r/tractusx/portal-administration-service)
-* [portal-marketplace-app-service](https://hub.docker.com/r/tractusx/portal-marketplace-app-service)
-* [portal-services-service](https://hub.docker.com/r/tractusx/portal-services-service)
-* [portal-notification-service](https://hub.docker.com/r/tractusx/portal-notification-service)
-* [portal-processes-worker](https://hub.docker.com/r/tractusx/portal-processes-worker)
-* [portal-portal-migrations](https://hub.docker.com/r/tractusx/portal-portal-migrations)
-* [portal-provisioning-migrations](https://hub.docker.com/r/tractusx/portal-provisioning-migrations)
-* [portal-maintenance-service](https://hub.docker.com/r/tractusx/portal-maintenance-service)
+* https://hub.docker.com/r/tractusx/portal-registration-service
+* https://hub.docker.com/r/tractusx/portal-administration-service
+* https://hub.docker.com/r/tractusx/portal-marketplace-app-service
+* https://hub.docker.com/r/tractusx/portal-services-service
+* https://hub.docker.com/r/tractusx/portal-notification-service
+* https://hub.docker.com/r/tractusx/portal-processes-worker
+* https://hub.docker.com/r/tractusx/portal-portal-migrations
+* https://hub.docker.com/r/tractusx/portal-provisioning-migrations
+* https://hub.docker.com/r/tractusx/portal-maintenance-service
 
 ### Base images
 
@@ -60,29 +60,6 @@ mcr.microsoft.com/dotnet/runtime:7.0-alpine:
 * GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
 * DockerHub: [https://hub.docker.com/_/microsoft-dotnet-runtime](https://hub.docker.com/_/microsoft-dotnet-runtime)
 
-## Notice for Nuget Packages
-
-This application provides nuget packages to share functionalities across different repos. To see how the development and update of nuget packages is working please have a look at the [documentation](/docs/nuget/update-nuget-packages.md).
-
-### Nuget
-
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Async](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Async/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Cors](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Cors/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.IO](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.IO/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Linq](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Linq/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Logging](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Logging/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Models](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Models/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Token](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Token/)
-* [Org.Eclipse.TractusX.Portal.Backend.Framework.Web](https://www.nuget.org/packages/Org.Eclipse.TractusX.Portal.Backend.Framework.Web/)
-
 ## License
 
 Distributed under the Apache 2.0 License.

docker/Dockerfile-iam-seeding

@@ -23,7 +23,7 @@ FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine-amd64 AS publish
 WORKDIR /
 COPY LICENSE NOTICE.md DEPENDENCIES /
 COPY /src/framework/Framework.Async /src/framework/Framework.Async
-COPY /src/framework/Framework.ErrorHandling /src/framework/Framework.ErrorHandling
+COPY /src/framework/Framework.ErrorHandling.Library /src/framework/Framework.ErrorHandling.Library
 COPY /src/framework/Framework.Linq /src/framework/Framework.Linq
 COPY /src/framework/Framework.Logging /src/framework/Framework.Logging
 COPY /src/framework/Framework.Models /src/framework/Framework.Models

docker/Dockerfile-maintenance-service

@@ -25,14 +25,15 @@ COPY LICENSE NOTICE.md DEPENDENCIES /
 COPY src/maintenance/Maintenance.App/ src/maintenance/Maintenance.App/
 COPY src/portalbackend/PortalBackend.DBAccess/ src/portalbackend/PortalBackend.DBAccess/
 COPY src/portalbackend/PortalBackend.PortalEntities/ src/portalbackend/PortalBackend.PortalEntities/
+COPY src/framework/Framework.BaseDependencies/ src/framework/Framework.BaseDependencies/
 COPY src/framework/Framework.DBAccess/ src/framework/Framework.DBAccess/
 COPY src/framework/Framework.Linq/ src/framework/Framework.Linq/
 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/framework/Framework.DateTimeProvider/ src/framework/Framework.DateTimeProvider/
-COPY src/processes/Processes.ProcessIdentity/ src/processes/Processes.ProcessIdentity/
+COPY src/framework/Framework.ErrorHandling.Library/ src/framework/Framework.ErrorHandling.Library/
+COPY src/framework/Framework.ProcessIdentity/ src/framework/Framework.ProcessIdentity/
+COPY /src/framework/Framework.DateTimeProvider /src/framework/Framework.DateTimeProvider
 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

docker/Dockerfile-portal-migrations

@@ -27,10 +27,11 @@ COPY /src/framework/Framework.DBAccess /src/framework/Framework.DBAccess
 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/framework/Framework.ErrorHandling.Library /src/framework/Framework.ErrorHandling.Library
+COPY /src/framework/Framework.BaseDependencies /src/framework/Framework.BaseDependencies
+COPY /src/framework/Framework.ProcessIdentity /src/framework/Framework.ProcessIdentity/
 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
 

docker/Dockerfile-provisioning-migrations

@@ -23,7 +23,8 @@ FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine-amd64 AS publish
 WORKDIR /
 COPY LICENSE NOTICE.md DEPENDENCIES /
 COPY /src/provisioning /src/provisioning
-COPY /src/framework/Framework.ErrorHandling /src/framework/Framework.ErrorHandling
+COPY /src/framework/Framework.ErrorHandling.Library /src/framework/Framework.ErrorHandling.Library
+COPY /src/framework/Framework.BaseDependencies /src/framework/Framework.BaseDependencies
 COPY /src/framework/Framework.Seeding /src/framework/Framework.Seeding
 COPY /src/framework/Framework.Models /src/framework/Framework.Models
 COPY /src/framework/Framework.Linq /src/framework/Framework.Linq
@@ -37,4 +38,4 @@ WORKDIR /migrations
 COPY --from=publish /migrations/publish .
 RUN chown -R 1000:3000 /migrations
 USER 1000:3000
-ENTRYPOINT ["dotnet", "Org.Eclipse.TractusX.Portal.Backend.Provisioning.Migrations.dll"]
+ENTRYPOINT ["dotnet", "Org.CatenaX.Ng.Portal.Backend.Provisioning.Migrations.dll"]