From 380bc1b34dbecd86052e1543ef0cda165b530580 Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Wed, 7 Feb 2024 14:22:45 +0100 Subject: [PATCH 1/4] Revert "fix(docker): adjust docker entry point (#486)" This reverts commit f1343b09e71bf60131ef808c0ae1ffb288036f01. --- .github/workflows/administration-service.yml | 1 - .github/workflows/maintenance-service.yml | 1 - .github/workflows/marketplace-app-service.yml | 1 - .github/workflows/notification-service.yml | 1 - .github/workflows/portal-migrations.yml | 1 - .github/workflows/processes-worker.yml | 1 - .github/workflows/provisioning-migrations.yml | 1 - .github/workflows/registration-service.yml | 1 - .github/workflows/services-service.yml | 1 - docker/Dockerfile-provisioning-migrations | 2 +- 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/administration-service.yml b/.github/workflows/administration-service.yml index 75f8c583c4..607f195b53 100644 --- a/.github/workflows/administration-service.yml +++ b/.github/workflows/administration-service.yml @@ -25,7 +25,6 @@ on: # service and transitive paths - 'src/administration/**' - 'src/externalsystems/**' - - 'src/framework/**' - 'src/keycloak/**' - 'src/mailing/**' - 'src/notifications/**' diff --git a/.github/workflows/maintenance-service.yml b/.github/workflows/maintenance-service.yml index a943cddaaa..3c64cfe244 100644 --- a/.github/workflows/maintenance-service.yml +++ b/.github/workflows/maintenance-service.yml @@ -23,7 +23,6 @@ on: push: paths: # service and transitive paths - - 'src/framework/**' - 'src/maintenance/Maintenance.App/**' - 'src/portalbackend/PortalBackend.PortalEntities/**' # workflow file diff --git a/.github/workflows/marketplace-app-service.yml b/.github/workflows/marketplace-app-service.yml index 49d5e9f503..4eababeafd 100644 --- a/.github/workflows/marketplace-app-service.yml +++ b/.github/workflows/marketplace-app-service.yml @@ -25,7 +25,6 @@ on: # service and transitive paths - 'src/marketplace/Apps.Service/**' - 'src/marketplace/Offers.Library/**' - - 'src/framework/**' - 'src/keycloak/**' - 'src/mailing/**' - 'src/notifications/**' diff --git a/.github/workflows/notification-service.yml b/.github/workflows/notification-service.yml index 78e606c35c..492fbf9163 100644 --- a/.github/workflows/notification-service.yml +++ b/.github/workflows/notification-service.yml @@ -24,7 +24,6 @@ on: paths: # service and transitive paths - 'src/notifications/**' - - 'src/framework/**' - 'src/keycloak/**' - 'src/portalbackend/**' - 'src/web/**' diff --git a/.github/workflows/portal-migrations.yml b/.github/workflows/portal-migrations.yml index 6b0a5ef6c6..a045572015 100644 --- a/.github/workflows/portal-migrations.yml +++ b/.github/workflows/portal-migrations.yml @@ -23,7 +23,6 @@ on: push: paths: # service and transitive paths - - 'src/framework/**' - 'src/portalbackend/PortalBackend.Migrations/**' - 'src/portalbackend/PortalBackend.PortalEntities/**' # workflow file diff --git a/.github/workflows/processes-worker.yml b/.github/workflows/processes-worker.yml index 15271128a3..d1349331e4 100644 --- a/.github/workflows/processes-worker.yml +++ b/.github/workflows/processes-worker.yml @@ -23,7 +23,6 @@ on: push: paths: # service and transitive paths - - 'src/framework/**' - 'src/processes/Processes.ProcessIdentity/**' - 'src/processes/Processes.Worker/**' - 'src/processes/ApplicationChecklist.Library/**' diff --git a/.github/workflows/provisioning-migrations.yml b/.github/workflows/provisioning-migrations.yml index 33d55256c4..caa9f99cae 100644 --- a/.github/workflows/provisioning-migrations.yml +++ b/.github/workflows/provisioning-migrations.yml @@ -23,7 +23,6 @@ on: push: paths: # service and transitive paths - - 'src/framework/**' - 'src/provisioning/Provisioning.Migrations/**' - 'src/provisioning/Provisioning.ProvisioningEntities/**' # workflow file diff --git a/.github/workflows/registration-service.yml b/.github/workflows/registration-service.yml index d7e25b714e..c626cb82ff 100644 --- a/.github/workflows/registration-service.yml +++ b/.github/workflows/registration-service.yml @@ -23,7 +23,6 @@ on: push: paths: # service and transitive paths - - 'src/framework/**' - 'src/registration/**' - 'src/keycloak/**' - 'src/mailing/**' diff --git a/.github/workflows/services-service.yml b/.github/workflows/services-service.yml index e3307e894e..15e132d8f8 100644 --- a/.github/workflows/services-service.yml +++ b/.github/workflows/services-service.yml @@ -23,7 +23,6 @@ on: push: paths: # service and transitive paths - - 'src/framework/**' - 'src/marketplace/Services.Service/**' - 'src/marketplace/Offers.Library/**' - 'src/keycloak/**' diff --git a/docker/Dockerfile-provisioning-migrations b/docker/Dockerfile-provisioning-migrations index 20fd0196bf..fba386db37 100644 --- a/docker/Dockerfile-provisioning-migrations +++ b/docker/Dockerfile-provisioning-migrations @@ -37,4 +37,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"] From 99d99aa2caceebaff1ec240edbb65ad5cc69d325 Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Wed, 7 Feb 2024 14:24:56 +0100 Subject: [PATCH 2/4] Revert "fix(jwt): roll back Authentication.JwtBearer version upgrade (#485)" This reverts commit 2a22e12aee3bd6f1e69034628324c300e75ffe31. --- src/framework/Framework.Web/Framework.Web.csproj | 2 +- .../Keycloak.Authentication/Keycloak.Authentication.csproj | 4 ++-- tests/endtoend/EndToEnd.Tests.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/framework/Framework.Web/Framework.Web.csproj b/src/framework/Framework.Web/Framework.Web.csproj index 1f1b251098..b0658c47be 100644 --- a/src/framework/Framework.Web/Framework.Web.csproj +++ b/src/framework/Framework.Web/Framework.Web.csproj @@ -73,7 +73,7 @@ - + diff --git a/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj b/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj index 1c011efbcd..383da8df48 100644 --- a/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj +++ b/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj @@ -31,9 +31,9 @@ - + - + diff --git a/tests/endtoend/EndToEnd.Tests.csproj b/tests/endtoend/EndToEnd.Tests.csproj index b0c7dc575f..600d7c615a 100644 --- a/tests/endtoend/EndToEnd.Tests.csproj +++ b/tests/endtoend/EndToEnd.Tests.csproj @@ -36,7 +36,7 @@ - + From f959abde71e4ff71e34bbb674ea03244c770cbce Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Wed, 7 Feb 2024 14:25:06 +0100 Subject: [PATCH 3/4] Revert "fix(nuget): adjust docker images (#484)" This reverts commit 317a57e353bf5d94bff873b772f29617198c9e8a. --- 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, 377 insertions(+), 305 deletions(-) diff --git a/docker/Dockerfile-maintenance-service b/docker/Dockerfile-maintenance-service index 044cb8a853..584538856f 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/framework/Framework.DateTimeProvider/ src/framework/Framework.DateTimeProvider/ -COPY src/processes/Processes.ProcessIdentity/ src/processes/Processes.ProcessIdentity/ +COPY src/web/Web.Identity/ src/web/Web.Identity/ +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 diff --git a/docker/Dockerfile-portal-migrations b/docker/Dockerfile-portal-migrations index fef7fcf617..4a9df88c31 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 06c99ecad2..dea78c4165 100644 --- a/src/framework/Framework.Async/Framework.Async.csproj +++ b/src/framework/Framework.Async/Framework.Async.csproj @@ -57,4 +57,8 @@ + + + true + diff --git a/src/framework/Framework.Cors/Framework.Cors.csproj b/src/framework/Framework.Cors/Framework.Cors.csproj index fb717897e9..79491dabd5 100644 --- a/src/framework/Framework.Cors/Framework.Cors.csproj +++ b/src/framework/Framework.Cors/Framework.Cors.csproj @@ -68,4 +68,8 @@ + + + true + diff --git a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj index c30e1a39d0..2311b218f9 100644 --- a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj +++ b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj @@ -63,4 +63,8 @@ + + + true + diff --git a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj index 6b511db7f3..a5a2e918e6 100644 --- a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj +++ b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj @@ -64,4 +64,8 @@ + + + true + diff --git a/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj b/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj index 4c76a8d02e..6564a86600 100644 --- a/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj +++ b/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj @@ -66,4 +66,8 @@ + + true + + diff --git a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj index 9696d70cda..9b8d670527 100644 --- a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj +++ b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj @@ -1,78 +1,83 @@ - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + 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 + + + diff --git a/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj b/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj index f5e2e8c5f4..8739d99dd4 100644 --- a/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj +++ b/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj @@ -1,69 +1,73 @@ - - - - - - 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 - - - - - - - - - - - - - - - + + + + + + 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 + + + diff --git a/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj b/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj index ac34851320..c37edd0980 100644 --- a/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj +++ b/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj @@ -65,10 +65,15 @@ + + + true + + diff --git a/src/framework/Framework.IO/Framework.IO.csproj b/src/framework/Framework.IO/Framework.IO.csproj index 761893b6df..79d6072fe9 100644 --- a/src/framework/Framework.IO/Framework.IO.csproj +++ b/src/framework/Framework.IO/Framework.IO.csproj @@ -62,6 +62,7 @@ + @@ -69,4 +70,8 @@ + + true + + diff --git a/src/framework/Framework.Linq/Framework.Linq.csproj b/src/framework/Framework.Linq/Framework.Linq.csproj index 7d9a4a27a1..8eb8223cae 100644 --- a/src/framework/Framework.Linq/Framework.Linq.csproj +++ b/src/framework/Framework.Linq/Framework.Linq.csproj @@ -1,72 +1,77 @@ - - - - - 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 - - - - - - - - - - - - - - - - - - - + + + + + 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 + + + diff --git a/src/framework/Framework.Logging/Framework.Logging.csproj b/src/framework/Framework.Logging/Framework.Logging.csproj index 6e10f270ef..6af7967c0a 100644 --- a/src/framework/Framework.Logging/Framework.Logging.csproj +++ b/src/framework/Framework.Logging/Framework.Logging.csproj @@ -64,6 +64,7 @@ + @@ -74,4 +75,8 @@ + + true + + diff --git a/src/framework/Framework.Models/Framework.Models.csproj b/src/framework/Framework.Models/Framework.Models.csproj index 2faaf77964..0e1b1a7558 100644 --- a/src/framework/Framework.Models/Framework.Models.csproj +++ b/src/framework/Framework.Models/Framework.Models.csproj @@ -66,7 +66,7 @@ - + @@ -74,4 +74,8 @@ + + true + + diff --git a/src/framework/Framework.Seeding/Framework.Seeding.csproj b/src/framework/Framework.Seeding/Framework.Seeding.csproj index 8f3daf10d2..f335a8a004 100644 --- a/src/framework/Framework.Seeding/Framework.Seeding.csproj +++ b/src/framework/Framework.Seeding/Framework.Seeding.csproj @@ -72,7 +72,7 @@ - + @@ -80,4 +80,8 @@ + + true + + diff --git a/src/framework/Framework.Swagger/Framework.Swagger.csproj b/src/framework/Framework.Swagger/Framework.Swagger.csproj index ae8ec48102..55002d3186 100644 --- a/src/framework/Framework.Swagger/Framework.Swagger.csproj +++ b/src/framework/Framework.Swagger/Framework.Swagger.csproj @@ -62,6 +62,7 @@ + @@ -69,4 +70,8 @@ + + true + + diff --git a/src/framework/Framework.Token/Framework.Token.csproj b/src/framework/Framework.Token/Framework.Token.csproj index 5ef49e4e85..ff470afc46 100644 --- a/src/framework/Framework.Token/Framework.Token.csproj +++ b/src/framework/Framework.Token/Framework.Token.csproj @@ -67,6 +67,11 @@ + + + true + + diff --git a/src/framework/Framework.Web/Framework.Web.csproj b/src/framework/Framework.Web/Framework.Web.csproj index b0658c47be..ba1ca205ce 100644 --- a/src/framework/Framework.Web/Framework.Web.csproj +++ b/src/framework/Framework.Web/Framework.Web.csproj @@ -1,81 +1,86 @@ - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 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 + + + From 1ccc887331327961afe279f1cf13800ea1524528 Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Wed, 7 Feb 2024 14:30:44 +0100 Subject: [PATCH 4/4] Revert "feat(nuget): create nuget packages for framework (#325)" This reverts commit a542f141 --- .github/workflows/administration-service.yml | 2 +- .github/workflows/maintenance-service.yml | 1 + .github/workflows/marketplace-app-service.yml | 3 +- .github/workflows/notification-service.yml | 2 +- .github/workflows/nuget-package-push.yml | 74 -- .github/workflows/portal-migrations.yml | 1 + .github/workflows/processes-worker.yml | 2 +- .github/workflows/provisioning-migrations.yml | 1 + .github/workflows/registration-service.yml | 2 +- .github/workflows/services-service.yml | 2 +- ...e-checks.yml => unit.tests-formatting.yml} | 51 +- DEPENDENCIES | 2 - README.md | 41 +- docker/Dockerfile-iam-seeding | 2 +- docker/Dockerfile-maintenance-service | 5 +- docker/Dockerfile-portal-migrations | 5 +- docker/Dockerfile-provisioning-migrations | 3 +- docs/nuget/update-nuget-packages.md | 83 -- scripts/get_current_version.sh | 36 - scripts/no_suffix_version_check.sh | 29 - scripts/nuget_version_check.sh | 117 --- scripts/pack_and_push_packages.sh | 41 - scripts/pack_and_push_packages_local.sh | 22 - scripts/update_framework_versions.sh | 119 --- src/Portal.Backend.sln | 931 ++++++++---------- .../Administration.Service.csproj | 174 ++-- .../IdentityProviderBusinessLogic.cs | 2 +- .../BusinessLogic/UserUploadBusinessLogic.cs | 2 +- .../Controllers/CompanyDataController.cs | 3 +- .../Controllers/ConnectorsController.cs | 5 +- .../Controllers/DocumentsController.cs | 6 +- .../Controllers/IdentityProviderController.cs | 4 +- .../Controllers/InvitationController.cs | 4 +- .../Controllers/NetworkController.cs | 4 +- .../Controllers/PartnerNetworkController.cs | 2 +- .../Controllers/RegistrationController.cs | 3 +- .../RegistrationStatusController.cs | 4 +- .../Controllers/ServiceAccountController.cs | 3 +- .../SubscriptionConfigurationController.cs | 6 +- .../Controllers/UserController.cs | 3 +- ...istrationConnectorErrorMessageContainer.cs | 2 +- ...rationRegistrationErrorMessageContainer.cs | 2 +- ...tionServiceAccountErrorMessageContainer.cs | 2 +- .../Administration.Service/Program.cs | 10 +- .../Bpdm.Library/Bpdm.Library.csproj | 85 +- .../Bpdm.Library/BpdmServiceSettings.cs | 2 +- .../BpdmServiceCollectionExtension.cs | 3 +- .../BpnAccessCollectionExtension.cs | 2 +- .../Clearinghouse.Library.csproj | 6 + ...ClearinghouseServiceCollectionExtension.cs | 3 +- .../ClearinghouseSettings.cs | 2 +- .../Custodian.Library.csproj | 85 +- .../CustodianServiceCollectionExtension.cs | 3 +- .../Custodian.Library/CustodianSettings.cs | 2 +- ...OfferProviderServiceCollectionExtension.cs | 6 +- .../OfferProviderSettings.cs | 2 +- .../OfferProvider.Library.csproj | 75 +- ...rviceProviderServiceCollectionExtension.cs | 3 +- .../OnboardingServiceProvider.Library.csproj | 73 +- .../OnboardingServiceProviderService.cs | 3 +- .../SdFactory.Library.csproj | 80 +- .../SdFactory.Library/SdFactorySettings.cs | 2 +- .../SdServiceCollectionExtension.cs | 3 +- .../Framework.Async/Directory.Build.props | 4 +- .../Framework.Async/Framework.Async.csproj | 92 +- src/framework/Framework.Async/README.md | 21 - .../Framework.BaseDependencies.csproj} | 17 +- .../Framework.Cors/Directory.Build.props | 4 +- .../Framework.Cors/Framework.Cors.csproj | 112 +-- src/framework/Framework.Cors/README.md | 21 - .../Framework.DBAccess/Directory.Build.props | 4 +- .../Framework.DBAccess.csproj | 101 +- src/framework/Framework.DBAccess/README.md | 21 - .../Directory.Build.props | 4 +- .../Framework.DateTimeProvider.csproj | 103 +- .../Framework.DateTimeProvider/README.md | 21 - .../Framework.DependencyInjection.csproj | 73 -- .../Framework.DependencyInjection/IScoped.cs | 27 - .../ISingleton.cs | 27 - .../ITransient.cs | 27 - .../Framework.DependencyInjection/README.md | 21 - .../RegistrationHelper.cs | 78 -- .../ConfigurationException.cs | 0 .../ConfigurationValidation.cs | 0 .../ConflictException.cs | 0 .../ControllerArgumentException.cs | 0 .../DetailException.cs | 2 +- .../Directory.Build.props | 4 +- .../ErrorDetails.cs | 0 .../ForbiddenException.cs | 0 .../Framework.ErrorHandling.Library.csproj} | 22 +- .../Library}/ErrorMessageService.cs | 2 +- .../Library}/ErrorResponse.cs | 2 +- .../Library}/IErrorMessageContainer.cs | 2 +- .../Library}/IErrorMessageService.cs | 2 +- .../NotFoundException.cs | 0 .../ServiceException.cs | 0 .../UnexpectedConditionException.cs | 0 .../UnsupportedMediaTypeException.cs | 0 .../Directory.Build.props | 4 +- .../Framework.ErrorHandling.Web.csproj | 64 +- .../GeneralHttpErrorHandler.cs | 3 +- .../Framework.ErrorHandling.Web/README.md | 21 - .../Framework.ErrorHandling.csproj | 73 -- .../Framework.ErrorHandling/README.md | 21 - .../Directory.Build.props | 4 +- .../Framework.HttpClient.csproj} | 14 +- .../HttpAsyncResponseMessageExtension.cs | 0 .../HttpClientExtensions.cs | 11 +- .../Framework.HttpClientExtensions.csproj | 79 -- .../Framework.HttpClientExtensions/README.md | 21 - .../Framework.IO/Directory.Build.props | 4 +- .../Framework.IO/Framework.IO.csproj | 111 +-- src/framework/Framework.IO/README.md | 21 - src/framework/Framework.IO/UrlHelper.cs | 4 +- .../Framework.Linq/Directory.Build.props | 4 +- .../Framework.Linq/Framework.Linq.csproj | 48 +- src/framework/Framework.Linq/README.md | 21 - .../Framework.Logging/Directory.Build.props | 4 +- .../Framework.Logging.csproj | 65 +- .../LoggingHandler.cs | 2 +- src/framework/Framework.Logging/README.md | 21 - .../Framework.Models/Directory.Build.props | 4 +- .../Framework.Models/Framework.Models.csproj | 123 +-- .../KeyVaultAuthSettings.cs | 4 +- .../Framework.Models}/PolicyTypes.cs | 2 +- .../Framework.Models}/PortalClaimTypes.cs | 2 +- src/framework/Framework.Models/README.md | 22 - ...cessIdentityServiceCollectionExtensions.cs | 2 +- .../ProcessIdentitySettings.cs | 2 +- .../Framework.ProcessIdentity.csproj} | 6 +- .../IProcessIdentityDataBuilder.cs | 2 +- .../IProcessIdentityDataDetermination.cs | 2 +- .../ProcessIdentityDataBuilder.cs | 4 +- .../ProcessIdentityDataDetermination.cs | 2 +- .../ProcessIdentityService.cs | 4 +- .../PublicInfosServiceCollectionExtensions.cs | 2 +- .../Framework.PublicInfos.csproj} | 82 +- .../IPublicInformationBusinessLogic.cs | 2 +- .../OpenInformationController.cs | 4 +- .../PublicInformationBusinessLogic.cs | 2 +- .../PublicUrlAttribute.cs | 2 +- .../Framework.PublicInfos}/UrlInformation.cs | 2 +- .../Framework.Seeding/Directory.Build.props | 4 +- .../Framework.Seeding.csproj | 136 +-- src/framework/Framework.Seeding/README.md | 21 - .../Framework.Seeding/SeederSettings.cs | 3 + .../Framework.Swagger/Directory.Build.props | 4 +- .../Framework.Swagger.csproj | 115 +-- src/framework/Framework.Swagger/README.md | 21 - .../Framework.Token/Directory.Build.props | 4 +- .../Framework.Token/Framework.Token.csproj | 116 +-- .../Framework.Token/GetTokenSettings.cs | 10 +- .../Framework.Token/ITokenService.cs | 4 +- src/framework/Framework.Token/README.md | 21 - src/framework/Framework.Token/TokenService.cs | 6 +- .../ClaimsIdentityDataBuilder.cs | 2 +- .../Framework.Web}/ClaimsIdentityService.cs | 2 +- ...aimsIdentityServiceCollectionExtensions.cs | 2 +- .../Framework.Web/Directory.Build.props | 4 +- .../Framework.Web/Framework.Web.csproj | 56 +- .../IClaimsIdentityDataBuilder.cs | 2 +- .../MandatoryIdentityClaimHandler.cs | 133 +++ src/framework/Framework.Web/README.md | 21 - .../Framework.Web/StartupServiceExtensions.cs | 26 +- .../StartupServiceWebApplicationExtensions.cs | 25 +- .../WebApplicationBuildRunner.cs | 15 +- src/framework/README.md | 36 - .../ControllerExtensions.cs | 2 + .../Keycloak.Authentication.csproj | 9 +- .../KeycloakClaimsTransformation.cs | 2 +- .../Keycloak.ErrorHandling.csproj | 80 +- .../Keycloak.Factory/Keycloak.Factory.csproj | 80 +- .../BusinessLogic/ClientsUpdater.cs | 3 +- .../Keycloak.Seeding/Keycloak.Seeding.csproj | 145 +-- .../Mailing.SendMail/Mailing.SendMail.csproj | 1 - .../Mailing.Service/Mailing.Service.csproj | 1 + .../Mailing.Template/Mailing.Template.csproj | 102 +- .../Maintenance.App/Maintenance.App.csproj | 148 +-- src/maintenance/Maintenance.App/Program.cs | 2 +- .../Apps.Service/Apps.Service.csproj | 7 +- .../Controllers/AppChangeController.cs | 4 +- .../AppReleaseProcessController.cs | 3 +- .../Controllers/AppsController.cs | 5 +- src/marketplace/Apps.Service/Program.cs | 8 +- .../OfferDocumentService.cs | 4 +- .../Offers.Library.Web.csproj | 79 +- .../OfferSetupServiceExtensions.cs | 3 +- .../Offers.Library/Offers.Library.csproj | 89 +- .../Controllers/ServiceChangeController.cs | 4 +- .../Controllers/ServiceReleaseController.cs | 3 +- .../Controllers/ServicesController.cs | 8 +- src/marketplace/Services.Service/Program.cs | 8 +- .../Services.Service/Services.Service.csproj | 8 +- .../Controllers/NotificationController.cs | 3 +- .../Notifications.Service.csproj | 11 +- .../Notifications.Service/Program.cs | 8 +- .../Models/DocumentSeedData.cs | 2 +- .../PortalBackend.DBAccess.csproj | 91 +- .../PortalBackend.Migrations.csproj | 5 +- .../PortalBackend.Migrations/Program.cs | 2 +- .../PortalBackend.PortalEntities.csproj | 102 +- .../ApplicationChecklist.Config.csproj | 1 + .../NetworkRegistration.Library.csproj | 4 - .../IProcessTypeExecutor.cs | 1 - .../ProcessExecutionService.cs | 2 +- .../Processes.Worker.Library.csproj | 79 +- .../Processes.Worker/Processes.Worker.csproj | 159 +-- src/processes/Processes.Worker/Program.cs | 4 +- ...rovisioningServiceErrorMessageContainer.cs | 2 +- .../Provisioning.Library.csproj | 95 +- .../ProvisioningDbContextModelSnapshot.cs | 2 +- .../Provisioning.Migrations.csproj | 162 +-- .../ApplicationActivation.Library.csproj | 1 + .../Registration.Common.csproj | 67 +- .../BusinessLogic/IStaticDataBusinessLogic.cs | 2 + .../Controllers/NetworkController.cs | 4 +- .../Controllers/RegistrationController.cs | 4 +- .../Registration.Service/Program.cs | 8 +- .../Registration.Service.csproj | 6 +- .../MandatoryIdentityClaimHandler.cs | 131 --- src/web/Web.Initialization/WebAppHelper.cs | 73 -- .../Administration.Service.Tests.csproj | 4 +- .../IdentityProviderBusinessLogicTests.cs | 2 +- .../RegistrationStatusBusinessLogicTest.cs | 1 + .../BusinessLogic/UserBusinessLogicTests.cs | 2 +- .../UserUploadBusinessLogicTests.cs | 3 +- .../Controllers/DocumentsControllerTests.cs | 1 + .../Controllers/RegistrationControllerTest.cs | 1 + .../ServiceAccountControllerTests.cs | 1 + ...ubscriptionConfigurationControllerTests.cs | 1 + .../Controllers/UserControllerTest.cs | 1 + tests/endtoend/EndToEnd.Tests.csproj | 2 +- .../WalletEndPointTests.cs | 1 + .../Bpdm.Library/BpdmServiceTests.cs | 4 +- .../ClearinghouseServiceTests.cs | 4 +- .../CustodianServiceTests.cs | 4 +- .../OfferProviderServiceTests.cs | 4 +- ...ardingServiceProvider.Library.Tests.csproj | 1 + .../OnboardingServiceProviderServiceTests.cs | 3 +- .../SdFactoryServiceTests.cs | 2 +- .../Framework.Async.Tests.csproj | 15 +- .../IAsyncEnumerableExtensionTests.cs | 9 +- .../framework/Framework.Async.Tests/Usings.cs | 1 + .../Framework.DBAccess.Tests.csproj | 16 +- .../Framework.ErrorHandling.Web.Tests.csproj | 3 +- .../GeneralHttpErrorHandlerTests.cs | 16 +- .../Framework.IO.Tests.csproj | 17 +- .../Framework.Linq.Tests.csproj | 2 +- .../Framework.Linq.Tests/IfAnyTests.cs | 2 +- .../Framework.Logging.Tests.csproj | 15 +- .../Framework.Logging.Tests/Usings.cs | 3 + .../Framework.Models.Tests.csproj | 4 +- .../HasNextEnumeratorExtensionsTests.cs | 9 +- .../Framework.PublicInfos.Tests.csproj} | 10 +- .../PublicInformationBusinessLogicTests.cs | 2 +- .../Framework.PublicInfos.Tests}/Usings.cs | 0 .../FakeIAsyncEnumerableExtensions.cs | 77 -- .../Framework.Tests.Shared.csproj | 49 - .../HttpMessageHandlerMock.cs | 64 -- .../Framework.Tests.Shared/Usings.cs | 20 - .../Framework.Token.Tests.csproj | 4 +- .../TokenServiceTests.cs | 5 +- .../Extensions/HttpExtensions.cs | 52 - .../Framework.Web.Tests.csproj | 5 +- .../HealthCheckExtensionsTests.cs | 4 +- .../JwtBearerConfigurationHealthCheckTests.cs | 6 +- .../MandatoryIdentityClaimHandlerTests.cs | 4 +- .../KeycloakClaimsTransformationTests.cs | 2 +- .../Apps.Service.Tests.csproj | 1 - .../Services.Service.Tests.csproj | 1 - .../ApplicationRepositoryTests.cs | 1 + .../CompanyRolesRepositoryTests.cs | 1 + .../PortalBackend.DBAccess.Tests.csproj | 392 ++++++-- .../ProcessExecutionServiceTests.cs | 4 +- .../Registration.Service.Tests.csproj | 1 + .../Extensions/ControllerExtensions.cs | 2 +- .../Extensions/HttpExtensions.cs | 0 .../Tests.Shared}/HttpMessageHandlerMock.cs | 3 +- .../IntegrationTests/BasePublicUrlTests.cs | 2 +- .../IntegrationTests/FakePolicyEvaluator.cs | 2 +- .../Tests.Shared}/MockLogger.cs | 3 +- tests/shared/Tests.Shared/Tests.Shared.csproj | 24 +- tests/web/Web.PublicInfos.Tests/Usings.cs | 25 - .../Web.PublicInfos.Tests.csproj | 48 - 285 files changed, 2806 insertions(+), 4759 deletions(-) delete mode 100644 .github/workflows/nuget-package-push.yml rename .github/workflows/{pre-checks.yml => unit.tests-formatting.yml} (50%) delete mode 100644 docs/nuget/update-nuget-packages.md delete mode 100755 scripts/get_current_version.sh delete mode 100755 scripts/no_suffix_version_check.sh delete mode 100755 scripts/nuget_version_check.sh delete mode 100755 scripts/pack_and_push_packages.sh delete mode 100755 scripts/pack_and_push_packages_local.sh delete mode 100755 scripts/update_framework_versions.sh delete mode 100644 src/framework/Framework.Async/README.md rename src/framework/{Framework.ErrorHandling/Directory.Build.props => Framework.BaseDependencies/Framework.BaseDependencies.csproj} (60%) delete mode 100644 src/framework/Framework.Cors/README.md delete mode 100644 src/framework/Framework.DBAccess/README.md delete mode 100644 src/framework/Framework.DateTimeProvider/README.md delete mode 100644 src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj delete mode 100644 src/framework/Framework.DependencyInjection/IScoped.cs delete mode 100644 src/framework/Framework.DependencyInjection/ISingleton.cs delete mode 100644 src/framework/Framework.DependencyInjection/ITransient.cs delete mode 100644 src/framework/Framework.DependencyInjection/README.md delete mode 100644 src/framework/Framework.DependencyInjection/RegistrationHelper.cs rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ConfigurationException.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ConfigurationValidation.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ConflictException.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ControllerArgumentException.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/DetailException.cs (99%) rename src/framework/{Framework.HttpClientExtensions => Framework.ErrorHandling.Library}/Directory.Build.props (94%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ErrorDetails.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ForbiddenException.cs (100%) rename src/{web/Web.PublicInfos/Web.PublicInfos.csproj => framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj} (57%) rename src/framework/{Framework.ErrorHandling/Service => Framework.ErrorHandling.Library/Library}/ErrorMessageService.cs (99%) rename src/framework/{Framework.ErrorHandling/Service => Framework.ErrorHandling.Library/Library}/ErrorResponse.cs (98%) rename src/framework/{Framework.ErrorHandling/Service => Framework.ErrorHandling.Library/Library}/IErrorMessageContainer.cs (98%) rename src/framework/{Framework.ErrorHandling/Service => Framework.ErrorHandling.Library/Library}/IErrorMessageService.cs (98%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/NotFoundException.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/ServiceException.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/UnexpectedConditionException.cs (100%) rename src/framework/{Framework.ErrorHandling => Framework.ErrorHandling.Library}/UnsupportedMediaTypeException.cs (100%) delete mode 100644 src/framework/Framework.ErrorHandling.Web/README.md delete mode 100644 src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj delete mode 100644 src/framework/Framework.ErrorHandling/README.md rename src/framework/{Framework.DependencyInjection => Framework.HttpClient}/Directory.Build.props (94%) rename src/{web/Web.Identity/Web.Identity.csproj => framework/Framework.HttpClient/Framework.HttpClient.csproj} (62%) rename src/framework/{Framework.HttpClientExtensions => Framework.HttpClient}/HttpAsyncResponseMessageExtension.cs (100%) rename src/framework/{Framework.HttpClientExtensions => Framework.HttpClient}/HttpClientExtensions.cs (81%) delete mode 100644 src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj delete mode 100644 src/framework/Framework.HttpClientExtensions/README.md delete mode 100644 src/framework/Framework.IO/README.md delete mode 100644 src/framework/Framework.Linq/README.md rename src/framework/{Framework.HttpClientExtensions => Framework.Logging}/LoggingHandler.cs (96%) delete mode 100644 src/framework/Framework.Logging/README.md rename src/framework/{Framework.Token => Framework.Models}/KeyVaultAuthSettings.cs (92%) rename src/{web/Web.Identity => framework/Framework.Models}/PolicyTypes.cs (95%) rename src/{web/Web.Identity => framework/Framework.Models}/PortalClaimTypes.cs (94%) delete mode 100644 src/framework/Framework.Models/README.md rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs (97%) rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/DependencyInjection/ProcessIdentitySettings.cs (94%) rename src/{processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj => framework/Framework.ProcessIdentity/Framework.ProcessIdentity.csproj} (87%) rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/IProcessIdentityDataBuilder.cs (95%) rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/IProcessIdentityDataDetermination.cs (94%) rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/ProcessIdentityDataBuilder.cs (94%) rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/ProcessIdentityDataDetermination.cs (97%) rename src/{processes/Processes.ProcessIdentity => framework/Framework.ProcessIdentity}/ProcessIdentityService.cs (90%) rename src/{web/Web.PublicInfos => framework/Framework.PublicInfos}/DependencyInjection/PublicInfosServiceCollectionExtensions.cs (93%) rename src/{web/Web.Initialization/Web.Initialization.csproj => framework/Framework.PublicInfos/Framework.PublicInfos.csproj} (55%) rename src/{web/Web.PublicInfos => framework/Framework.PublicInfos}/IPublicInformationBusinessLogic.cs (93%) rename src/{web/Web.PublicInfos => framework/Framework.PublicInfos}/OpenInformationController.cs (94%) rename src/{web/Web.PublicInfos => framework/Framework.PublicInfos}/PublicInformationBusinessLogic.cs (98%) rename src/{web/Web.PublicInfos => framework/Framework.PublicInfos}/PublicUrlAttribute.cs (94%) rename src/{web/Web.PublicInfos => framework/Framework.PublicInfos}/UrlInformation.cs (94%) delete mode 100644 src/framework/Framework.Seeding/README.md delete mode 100644 src/framework/Framework.Swagger/README.md delete mode 100644 src/framework/Framework.Token/README.md rename src/{web/Web.Identity => framework/Framework.Web}/ClaimsIdentityDataBuilder.cs (97%) rename src/{web/Web.Identity => framework/Framework.Web}/ClaimsIdentityService.cs (95%) rename src/{web/Web.Identity => framework/Framework.Web}/ClaimsIdentityServiceCollectionExtensions.cs (95%) rename src/{web/Web.Identity => framework/Framework.Web}/IClaimsIdentityDataBuilder.cs (95%) create mode 100644 src/framework/Framework.Web/MandatoryIdentityClaimHandler.cs delete mode 100644 src/framework/Framework.Web/README.md delete mode 100644 src/framework/README.md delete mode 100644 src/web/Web.Identity/MandatoryIdentityClaimHandler.cs delete mode 100644 src/web/Web.Initialization/WebAppHelper.cs rename tests/{web/Web.Identity.Tests/Web.Identity.Tests.csproj => framework/Framework.PublicInfos.Tests/Framework.PublicInfos.Tests.csproj} (87%) rename tests/{web/Web.PublicInfos.Tests => framework/Framework.PublicInfos.Tests}/PublicInformationBusinessLogicTests.cs (98%) rename tests/{web/Web.Identity.Tests => framework/Framework.PublicInfos.Tests}/Usings.cs (100%) delete mode 100644 tests/framework/Framework.Tests.Shared/Extensions/FakeIAsyncEnumerableExtensions.cs delete mode 100644 tests/framework/Framework.Tests.Shared/Framework.Tests.Shared.csproj delete mode 100644 tests/framework/Framework.Tests.Shared/HttpMessageHandlerMock.cs delete mode 100644 tests/framework/Framework.Tests.Shared/Usings.cs delete mode 100644 tests/framework/Framework.Web.Tests/Extensions/HttpExtensions.cs rename tests/{web/Web.Identity.Tests => framework/Framework.Web.Tests}/MandatoryIdentityClaimHandlerTests.cs (98%) rename tests/{framework/Framework.Tests.Shared => shared/Tests.Shared}/Extensions/HttpExtensions.cs (100%) rename tests/{framework/Framework.Web.Tests => shared/Tests.Shared}/HttpMessageHandlerMock.cs (95%) rename tests/{framework/Framework.Tests.Shared => shared/Tests.Shared}/MockLogger.cs (94%) delete mode 100644 tests/web/Web.PublicInfos.Tests/Usings.cs delete mode 100644 tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj diff --git a/.github/workflows/administration-service.yml b/.github/workflows/administration-service.yml index 607f195b53..3395ad80b3 100644 --- a/.github/workflows/administration-service.yml +++ b/.github/workflows/administration-service.yml @@ -25,12 +25,12 @@ on: # service and transitive paths - 'src/administration/**' - 'src/externalsystems/**' + - 'src/framework/**' - 'src/keycloak/**' - 'src/mailing/**' - 'src/notifications/**' - 'src/portalbackend/**' - 'src/provisioning/**' - - 'src/web/**' # workflow file - '.github/workflows/administration-service.yml' # dockerfile diff --git a/.github/workflows/maintenance-service.yml b/.github/workflows/maintenance-service.yml index 3c64cfe244..b6570ce8b1 100644 --- a/.github/workflows/maintenance-service.yml +++ b/.github/workflows/maintenance-service.yml @@ -24,6 +24,7 @@ on: paths: # service and transitive paths - 'src/maintenance/Maintenance.App/**' + - 'src/framework/**' - 'src/portalbackend/PortalBackend.PortalEntities/**' # workflow file - '.github/workflows/maintenance-service.yml' diff --git a/.github/workflows/marketplace-app-service.yml b/.github/workflows/marketplace-app-service.yml index 4eababeafd..154326d66a 100644 --- a/.github/workflows/marketplace-app-service.yml +++ b/.github/workflows/marketplace-app-service.yml @@ -24,12 +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 diff --git a/.github/workflows/notification-service.yml b/.github/workflows/notification-service.yml index 492fbf9163..b781d3717d 100644 --- a/.github/workflows/notification-service.yml +++ b/.github/workflows/notification-service.yml @@ -24,9 +24,9 @@ on: paths: # service and transitive paths - 'src/notifications/**' + - 'src/framework/**' - 'src/keycloak/**' - 'src/portalbackend/**' - - 'src/web/**' # workflow file - '.github/workflows/notification-service.yml' # dockerfile diff --git a/.github/workflows/nuget-package-push.yml b/.github/workflows/nuget-package-push.yml deleted file mode 100644 index 18ac0e30ef..0000000000 --- a/.github/workflows/nuget-package-push.yml +++ /dev/null @@ -1,74 +0,0 @@ -############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -name: Push Nuget Packages and Tag - -on: - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - dotnet-version: ['7.0'] - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} - uses: actions/setup-dotnet@v2 - with: - dotnet-version: ${{ matrix.dotnet-version }} - - - name: Install dependencies - run: dotnet restore src - - - name: Build - run: dotnet build src --configuration Release --no-restore - - - name: Check Package Suffix Versions - shell: bash - run: | - script_output=$(./scripts/no_suffix_check.sh) - - if [ -z "$script_output" ]; then - echo "No version suffixes set" - else - echo "the following packages have a suffix version set, please remove them:" - echo "$script_output" - exit 1 - fi - - - name: Push nuget packages - shell: bash - run: | - bash ./scripts/pack_and_push_packages.sh --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate - - - name: Get new version - id: nugetPackageVersion - shell: bash - run: | - current_version=$(./scripts/get_current_version.sh) - echo "version=$current_version" >> "$GITHUB_OUTPUT" - - - name: Create git tag - uses: rickstaa/action-create-tag@v1 - with: - tag: v${{ steps.nugetPackageVersion.outputs.version }} diff --git a/.github/workflows/portal-migrations.yml b/.github/workflows/portal-migrations.yml index a045572015..6b0a5ef6c6 100644 --- a/.github/workflows/portal-migrations.yml +++ b/.github/workflows/portal-migrations.yml @@ -23,6 +23,7 @@ on: push: paths: # service and transitive paths + - 'src/framework/**' - 'src/portalbackend/PortalBackend.Migrations/**' - 'src/portalbackend/PortalBackend.PortalEntities/**' # workflow file diff --git a/.github/workflows/processes-worker.yml b/.github/workflows/processes-worker.yml index d1349331e4..f097a90ee9 100644 --- a/.github/workflows/processes-worker.yml +++ b/.github/workflows/processes-worker.yml @@ -23,13 +23,13 @@ on: push: paths: # service and transitive paths - - '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' diff --git a/.github/workflows/provisioning-migrations.yml b/.github/workflows/provisioning-migrations.yml index caa9f99cae..33d55256c4 100644 --- a/.github/workflows/provisioning-migrations.yml +++ b/.github/workflows/provisioning-migrations.yml @@ -23,6 +23,7 @@ on: push: paths: # service and transitive paths + - 'src/framework/**' - 'src/provisioning/Provisioning.Migrations/**' - 'src/provisioning/Provisioning.ProvisioningEntities/**' # workflow file diff --git a/.github/workflows/registration-service.yml b/.github/workflows/registration-service.yml index c626cb82ff..cb0106caf9 100644 --- a/.github/workflows/registration-service.yml +++ b/.github/workflows/registration-service.yml @@ -24,11 +24,11 @@ on: paths: # service and transitive paths - 'src/registration/**' + - 'src/framework/**' - 'src/keycloak/**' - 'src/mailing/**' - 'src/portalbackend/**' - 'src/provisioning/**' - - 'src/web/**' # workflow file - '.github/workflows/registration-service.yml' # dockerfile diff --git a/.github/workflows/services-service.yml b/.github/workflows/services-service.yml index 15e132d8f8..c01f237c69 100644 --- a/.github/workflows/services-service.yml +++ b/.github/workflows/services-service.yml @@ -25,10 +25,10 @@ on: # service and transitive paths - '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 diff --git a/.github/workflows/pre-checks.yml b/.github/workflows/unit.tests-formatting.yml similarity index 50% rename from .github/workflows/pre-checks.yml rename to .github/workflows/unit.tests-formatting.yml index 8bb147b61f..cb772cf6d5 100644 --- a/.github/workflows/pre-checks.yml +++ b/.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 diff --git a/DEPENDENCIES b/DEPENDENCIES index 47d1893765..0f8e6299bf 100644 --- a/DEPENDENCIES +++ b/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 diff --git a/README.md b/README.md index 37b47db295..880875bced 100644 --- a/README.md +++ b/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. diff --git a/docker/Dockerfile-iam-seeding b/docker/Dockerfile-iam-seeding index 69f14f514e..b059f7ec15 100644 --- a/docker/Dockerfile-iam-seeding +++ b/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 diff --git a/docker/Dockerfile-maintenance-service b/docker/Dockerfile-maintenance-service index 584538856f..f0a2a49a9b 100644 --- a/docker/Dockerfile-maintenance-service +++ b/docker/Dockerfile-maintenance-service @@ -25,13 +25,14 @@ 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/web/Web.Identity/ src/web/Web.Identity/ +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 diff --git a/docker/Dockerfile-portal-migrations b/docker/Dockerfile-portal-migrations index 4a9df88c31..26de4aa4c4 100644 --- a/docker/Dockerfile-portal-migrations +++ b/docker/Dockerfile-portal-migrations @@ -27,8 +27,9 @@ 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/web/Web.Identity /src/web/Web.Identity/ +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 WORKDIR /src/portalbackend/PortalBackend.Migrations diff --git a/docker/Dockerfile-provisioning-migrations b/docker/Dockerfile-provisioning-migrations index fba386db37..348c4fff78 100644 --- a/docker/Dockerfile-provisioning-migrations +++ b/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 diff --git a/docs/nuget/update-nuget-packages.md b/docs/nuget/update-nuget-packages.md deleted file mode 100644 index a600534c1f..0000000000 --- a/docs/nuget/update-nuget-packages.md +++ /dev/null @@ -1,83 +0,0 @@ -# Update nuget packages - -Each project of the [framework](/src/framework/) directory is build and provided as an nuget package. - -To be able to build and test changes locally we recommend the following setup: - -## Local nuget directory - -1. Create a directory to store the locally build nuget packages - -```bash -mkdir ~/packages - -``` - -2. Add the directory to the nuget config - -```bash -dotnet nuget add source ~/packages --name local - -``` - -## Update version for packages - -After the changes within the source code are done you can execute the following script from the root of the project to update the packages: - -To update the version for the packages: - -```bash -./scripts/update_framework_versions.sh -``` - -For version there are the following options: - - major - - minor - - patch - - alpha - - beta - - rc - - pre - -Depending on the version the Directory.Build.props of the project will be updated. -For major, minor and patch the version will be incremented by 1. -For alpha, beta, rc, pre the Suffix will be set, if the version is already in the suffix it will be incremented by one. - -Example: - -|current value|used version| new value | -|-------------|------------|-------------| -| 1.0.0 | major | 2.0.0 | -| 1.1.0 | major | 2.0.0 | -| 1.1.0.alpha | major | 2.0.0 | -| 1.0.0 | minor | 1.1.0 | -| 1.1.0 | minor | 1.2.0 | -| 1.0.1 | minor | 1.1.0 | -| 1.1.0.alpha | minor | 1.2.0 | -| 1.0.0 | patch | 1.0.1 | -| 1.1.0 | patch | 1.1.1 | -| 1.0.1 | minor | 1.0.2 | -| 1.1.0.alpha | minor | 1.1.1 | -| 1.1.0 | alpha | 1.1.0.alpha | -|1.1.0.alpha.1| alpha |1.1.0.alpha.2| -| 1.1.0.beta | alpha | 1.1.0.alpha | - -## Build and push nuget packages - -To build and push the changed nuget packages make sure to first update the package version, you should use one of the script mentioned above to make sure that all dependent packages are updated as well. - -After all packages are updated to the wanted version you can run the following command from the root of the project to build and push the nuget packages: - -To push the updated packages to the local source - -```bash -./scripts/pack_and_push_packages_local.sh -``` - -To update the version of a specific package: - -```bash -./scripts/pack_and_push_packages.sh -``` - -NUGET_API_KEY is the key generated on nuget.org. The last command should only be executed within the github action [nuget-package-push](/.github/workflows/nuget-package-push.yml) diff --git a/scripts/get_current_version.sh b/scripts/get_current_version.sh deleted file mode 100755 index 6178ecd35d..0000000000 --- a/scripts/get_current_version.sh +++ /dev/null @@ -1,36 +0,0 @@ -############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -#!/bin/bash - -file="src/framework/Framework.Async/Directory.Build.props" -# Get the version prefix -version_prefix=$(grep -oP '\K[^<]+' $file) - -# Get the version suffix -version_suffix=$(grep -oP '\K[^<]+' $file) - -# Combine the prefix and suffix if the suffix is not empty -if [ -n "$version_suffix" ]; then - version="$version_prefix-$version_suffix-framework" -else - version="$version_prefix-framework" -fi - -echo "Version: $version" diff --git a/scripts/no_suffix_version_check.sh b/scripts/no_suffix_version_check.sh deleted file mode 100755 index e04c1903dd..0000000000 --- a/scripts/no_suffix_version_check.sh +++ /dev/null @@ -1,29 +0,0 @@ -############################################################### -# Copyright (c) 2024 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -#!/bin/bash - -for dir in ./src/framework/*/; do - if [ -d "$dir" ]; then - local props_file=$dir"Directory.Build.props" - if ! grep -qE "<\/VersionSuffix>" $props_file; then - echo $dir - fi - fi -done diff --git a/scripts/nuget_version_check.sh b/scripts/nuget_version_check.sh deleted file mode 100755 index 66936801d7..0000000000 --- a/scripts/nuget_version_check.sh +++ /dev/null @@ -1,117 +0,0 @@ -############################################################### -# Copyright (c) 2024 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -#!/bin/bash - -# Get branch names -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " - exit 1 -fi - -# Assign the arguments to variables -branchRange="$1" - -# Initialize a global arrays to store data -version_update_needed=() - -check_version_update(){ - local project="$1" - local props_file=$project"Directory.Build.props" - - # check if the code (.cs) unchanged - if ! git diff --name-only $branchRange -- "$project" | grep -qE '\.cs$' || - # check if build.props file has been deleted - ! [ -z $(git diff --name-only --diff-filter=D $branchRange -- "$props_file") ]; then - return - fi - - # check if build.props file is unchanged - if [ -z $(git diff --name-only $branchRange -- "$props_file") ]; then - version_update_needed+=($project) - return - fi - - suffix_before=$(git diff $branchRange -- "$props_file" | grep -E '^-.*' | sed -E 's/^-.*([^<]*)<\/VersionSuffix>/\1/') - suffix_after=$(git diff $branchRange -- "$props_file" | grep -E '^\+.*' | sed -E 's/^\+.*([^<]*)<\/VersionSuffix>/\1/') - - version_before=$(git diff $branchRange -- "$props_file" | grep -E '^-.*' | sed -E 's/^-.*([^<]*)<\/VersionPrefix>/\1/') - version_after=$(git diff $branchRange -- "$props_file" | grep -E '^\+.*' | sed -E 's/^\+.*([^<]*)<\/VersionPrefix>/\1/') - - if [ -z $version_after ] && - [ -z $suffix_after ] && - [ -z $suffix_before ]; then - version_update_needed+=($project) - return - fi - - if [ -z $version_before ]; then - version_before="0.0.0" - fi - - if [ -z $version_after ]; then - version_after=$version_before - fi - - IFS='.' read -r major_before minor_before patch_before <<< "$version_before" - IFS='.' read -r major_after minor_after patch_after <<< "$version_after" - - if [ -n "$major_before" ] && [ -n "$major_after" ] && - [ -n "$minor_before" ] && [ -n "$minor_after" ] && - [ -n "$patch_before" ] && [ -n "$patch_after" ]; then - - # example - # 1.0.0.rc1 -> 1.0.0.rc1 OK - # 1.0.0.rc1 -> 1.0.0.rc2 OK - # 1.0.0.rc1 -> 1.0.0 OK - if [ -n "$suffix_before" ] && - [ "$major_after" -eq "$major_before" -a "$minor_after" -eq "$minor_before" -a "$patch_after" -eq "$patch_before" ]; then - return - fi - - # example - # 1.0.0 -> 1.1.0.rc1 OK - # 1.0.0.rc1 -> 1.1.0.rc2 OK - # 1.0.0 -> 2.0.0 OK - # 1.0.0 -> 1.1.0 OK - # 1.0.0 -> 1.0.1 OK - # 1.0.0 -> 1.0.0.rc1 NOT OK - # 1.0.0 -> 0.9.0 NOT OK - if [ "$major_after" -gt "$major_before" ] || - [ "$major_after" -eq "$major_before" -a "$minor_after" -gt "$minor_before" ] || - [ "$major_after" -eq "$major_before" -a "$minor_after" -eq "$minor_before" -a "$patch_after" -gt "$patch_before" ]; then - return; - fi - - fi - - version_update_needed+=($project) -} - -# check version update was made for all framework packages which includes changes -for dir in ./src/framework/*/; do - if [ -d "$dir" ]; then - check_version_update $dir - fi -done - -# return all packages that still need a version update -for dir in "${version_update_needed[@]}"; do - echo "$dir" -done diff --git a/scripts/pack_and_push_packages.sh b/scripts/pack_and_push_packages.sh deleted file mode 100755 index 450f816a6e..0000000000 --- a/scripts/pack_and_push_packages.sh +++ /dev/null @@ -1,41 +0,0 @@ -############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -#!/bin/bash - -folderPath="./packages" - -# Function to iterate over directories in the Framework directory and create a nuget package -iterate_directories() { - for dir in ./src/framework/*/; do - if [ -d "$dir" ]; then - proj="$(basename "$dir")" - echo "Pack project: $proj" - dotnet pack src/framework/$proj/$proj.csproj -c Release -o "$folderPath" - fi - done -} - -iterate_directories - -for packageFile in "$folderPath"/*.nupkg; do - dotnet nuget push "$packageFile" "$@" -done - -rm -r "$folderPath" diff --git a/scripts/pack_and_push_packages_local.sh b/scripts/pack_and_push_packages_local.sh deleted file mode 100755 index 358c27d65c..0000000000 --- a/scripts/pack_and_push_packages_local.sh +++ /dev/null @@ -1,22 +0,0 @@ -############################################################### -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -#!/bin/bash - -. ./scripts/pack_and_push_packages.sh --source "local" --skip-duplicate diff --git a/scripts/update_framework_versions.sh b/scripts/update_framework_versions.sh deleted file mode 100755 index 50cffadcb9..0000000000 --- a/scripts/update_framework_versions.sh +++ /dev/null @@ -1,119 +0,0 @@ -############################################################### -# Copyright (c) 2024 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -#!/bin/bash - -# Check if the correct number of arguments are provided -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " - exit 1 -fi - -# Assign the arguments to variables -version="$1" - -# Define the version update functions -update_major() { - local version="$1" - local updated_version="$(echo "$version" | awk -F. '{$1+=1; $2=0; $3=0; print}' | tr ' ' '.')" - echo "$updated_version" -} - -update_minor() { - local version="$1" - local updated_version="$(echo "$version" | awk -F. '{$2+=1; $3=0; print}' | tr ' ' '.')" - echo "$updated_version" -} - -update_patch() { - local version="$1" - local updated_version="$(echo "$version" | awk -F. '{$3+=1; print}' | tr ' ' '.')" - echo "$updated_version" -} - -update_pre() { - local version="$1" - local current_suffix=$(grep '' "$props_file" | sed -n 's/.*\(.*\)<\/VersionSuffix>.*/\1/p' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | tr -d '\n') - local current_suffix_version="${current_suffix%%"."*}" - if [ "$current_suffix_version" != "$version" ]; then - updated_suffix="$version" - else - if [[ "$current_suffix" == "alpha" || "$current_suffix" == "beta" ]]; then - updated_suffix="${current_suffix}.1" - else - numeric_part=$(echo "$current_suffix" | sed 's/[^0-9]//g') - new_numeric_part=$((numeric_part + 1)) - updated_suffix="${version}.${new_numeric_part}" - fi - fi - echo "$updated_suffix" -} - -update_version(){ - local directory="$1" - - local props_file=$directory"Directory.Build.props" - # Check if the Directory.Builds.props file exists - if [ -f "$props_file" ]; then - # Extract the current version from the XML file - current_version=$(awk -F'[<>]' '//{print $3}' "$props_file") - current_suffix=$(awk -F'[<>]' '//{print $3}' "$props_file") - - case "$version" in - major) - updated_version=$(update_major "$current_version") - updated_suffix="" - ;; - minor) - updated_version=$(update_minor "$current_version") - updated_suffix="" - ;; - patch) - updated_version=$(update_patch "$current_version") - updated_suffix="" - ;; - alpha|beta|pre|rc) - updated_version="$current_version" - updated_suffix=$(update_pre "$version") - ;; - *) - echo "Invalid version argument. Valid options: major, minor, patch, alpha, beta, pre, rc" - exit 1 - ;; - esac - - # Update the VersionPrefix and VersionSuffix in the file - awk -v new_version="$updated_version" -v new_suffix="$updated_suffix" '//{gsub(/[^<]+<\/VersionPrefix>/, "" new_version "")}//{gsub(/[^<]+<\/VersionSuffix>/, "" new_suffix "")}1' "$props_file" > temp && mv temp "$props_file" - echo "Updated version in $props_file to $updated_version $updated_suffix" - else - echo "Directory.Builds.props file not found in $directory" - fi -} - -# Function to iterate over directories in the Framework directory and update the project version -iterate_directories() { - for dir in ./src/framework/*/; do - if [ -d "$dir" ]; then - update_version "$dir" - fi - done -} - -# Call the iterate_directories function to start the script -iterate_directories diff --git a/src/Portal.Backend.sln b/src/Portal.Backend.sln index 0f1f6cfe6b..9b5651ec1c 100644 --- a/src/Portal.Backend.sln +++ b/src/Portal.Backend.sln @@ -6,6 +6,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "administration", "administr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Administration.Service", "administration\Administration.Service\Administration.Service.csproj", "{06418D5E-5963-4D46-8F09-A0E132721C64}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{23500169-FC01-4D2B-A997-E7FAE2169FC0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Cors", "framework\Framework.Cors\Framework.Cors.csproj", "{AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ErrorHandling.Library", "framework\Framework.ErrorHandling.Library\Framework.ErrorHandling.Library.csproj", "{E6C12BC5-998A-49BD-A737-7C02D14EC5CA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.IO", "framework\Framework.IO\Framework.IO.csproj", "{4157A958-5EC3-4A62-8C50-D20753AEB39B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Models", "framework\Framework.Models\Framework.Models.csproj", "{367EF094-2B47-48F5-BE0B-829FE5CB905C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Swagger", "framework\Framework.Swagger\Framework.Swagger.csproj", "{2B5383E4-9A0D-4B19-B4E1-4715EA747B11}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Web", "framework\Framework.Web\Framework.Web.csproj", "{4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "keycloak", "keycloak", "{46383371-8252-4598-9350-A97692851408}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Keycloak.Authentication", "keycloak\Keycloak.Authentication\Keycloak.Authentication.csproj", "{69004CBA-5B0C-42C7-A4DA-4727F14AA20A}" @@ -64,6 +78,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Registration.Service", "reg EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Administration.Service.Tests", "..\tests\administration\Administration.Service.Tests\Administration.Service.Tests.csproj", "{1EFC9D98-C8EE-4399-9B2D-876CDDE8CFD3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ErrorHandling.Web.Tests", "..\tests\framework\Framework.ErrorHandling.Web.Tests\Framework.ErrorHandling.Web.Tests.csproj", "{FB2E573E-23BD-4111-A3E5-2C75B9920946}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Service.Tests", "..\tests\marketplace\Apps.Service.Tests\Apps.Service.Tests.csproj", "{F0EFB95B-39DD-4FDB-A044-0BB9302DDC41}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offers.Library.Tests", "..\tests\marketplace\Offers.Library.Tests\Offers.Library.Tests.csproj", "{F995582E-729F-4EA0-831F-6CA5058114EF}" @@ -84,12 +100,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Shared", "..\tests\sh EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{323C198D-A8C6-4EB0-8B79-72624275E35F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Async", "framework\Framework.Async\Framework.Async.csproj", "{A1862697-AB25-4D79-B601-02733A3490B2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.IO.Tests", "..\tests\framework\Framework.IO.Tests\Framework.IO.Tests.csproj", "{2E0BC264-3EB6-4EC2-B332-0F0E50180401}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.BaseDependencies", "framework\Framework.BaseDependencies\Framework.BaseDependencies.csproj", "{CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provisioning.Migrations", "provisioning\Provisioning.Migrations\Provisioning.Migrations.csproj", "{3F7A02D4-073C-40FE-B228-8E1BA96B1946}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Token", "framework\Framework.Token\Framework.Token.csproj", "{E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Token.Tests", "..\tests\framework\Framework.Token.Tests\Framework.Token.Tests.csproj", "{4316375F-361B-49D6-A310-08CD96D04398}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provisioning.DBAccess.Tests", "..\tests\provisioning\Provisioning.DBAccess.Tests\Provisioning.DBAccess.Tests.csproj", "{0C039C14-74CA-484C-B8D9-A307C97EC312}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maintenance.App.Tests", "..\tests\maintenance\Maintenance.App.Tests\Maintenance.App.Tests.csproj", "{3828FF08-4CD7-4FF8-B94A-ED5D5FFA0382}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Seeding", "framework\Framework.Seeding\Framework.Seeding.csproj", "{C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DBAccess", "framework\Framework.DBAccess\Framework.DBAccess.csproj", "{54799CEE-DC66-4B5B-9A2A-3C8732CAB669}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DBAccess.Tests", "..\tests\framework\Framework.DBAccess.Tests\Framework.DBAccess.Tests.csproj", "{D577BF62-519F-4AF7-B317-47B144186144}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationChecklist.Library.Tests", "..\tests\processes\ApplicationChecklist.Library.Tests\ApplicationChecklist.Library.Tests.csproj", "{8B7D8210-05A4-4C0A-AB19-D695E6E97281}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "processes", "processes", "{282CEF03-292F-4A49-83C6-997567D0FF5F}" @@ -110,6 +142,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Custodian.Library.Tests", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bpdm.Library", "..\tests\externalsystems\Bpdm.Library\Bpdm.Library.csproj", "{79118108-4654-4D71-8B04-C83FCF5C4EBA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Logging", "framework\Framework.Logging\Framework.Logging.csproj", "{DF65D45B-7779-4575-9CE8-0675C84A2495}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ErrorHandling.Web", "framework\Framework.ErrorHandling.Web\Framework.ErrorHandling.Web.csproj", "{635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clearinghouse.Library", "externalsystems\Clearinghouse.Library\Clearinghouse.Library.csproj", "{5BA98BC4-941A-4911-9479-EA4ED48D6FF3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clearinghouse.Library.Tests", "..\tests\externalsystems\Clearinghouse.Library.Tests\Clearinghouse.Library.Tests.csproj", "{4F0E9174-5DB5-42C5-9AA2-4914BDD29AE6}" @@ -122,8 +158,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationActivation.Libra EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationActivation.Library.Tests", "..\tests\registration\ApplicationActivation.Library.Tests\ApplicationActivation.Library.Tests.csproj", "{96D96CA7-35C0-40C6-A8C8-91E0C4456660}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DateTimeProvider", "framework\Framework.DateTimeProvider\Framework.DateTimeProvider.csproj", "{AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationChecklist.Config", "processes\ApplicationChecklist.Config\ApplicationChecklist.Config.csproj", "{C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.HttpClient", "framework\Framework.HttpClient\Framework.HttpClient.csproj", "{4B13E087-E789-4A8D-BE06-5461FA4900A5}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Processes.Worker.Library", "processes\Processes.Worker.Library\Processes.Worker.Library.csproj", "{527A4A82-D63A-4DD5-B37D-0AC8A79F1B0E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationChecklist.Executor", "processes\ApplicationChecklist.Executor\ApplicationChecklist.Executor.csproj", "{0221E83B-B26B-442F-ACAD-B1043DF9993A}" @@ -132,6 +172,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Processes.Worker.Library.Te EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortalBackend.Migrations.Tests", "..\tests\portalbackend\PortalBackend.Migrations.Tests\PortalBackend.Migrations.Tests.csproj", "{7985B208-CE41-49DA-B749-B94B582612E6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Async.Tests", "..\tests\framework\Framework.Async.Tests\Framework.Async.Tests.csproj", "{98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Web.Tests", "..\tests\framework\Framework.Web.Tests\Framework.Web.Tests.csproj", "{FD7EA0BC-B14C-4315-BDC8-1DD28B717042}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OfferSubscription.Executor", "processes\OfferSubscription.Executor\OfferSubscription.Executor.csproj", "{4C7E9EAC-222B-4C13-B8B1-5987406817A0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OfferSubscription.Library", "processes\OfferSubscription.Library\OfferSubscription.Library.csproj", "{15BA8836-E9FE-4F64-AD97-261A524779A5}" @@ -152,6 +196,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offers.Library.Web", "marke EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Offer.Library.Web.Tests", "..\tests\marketplace\Offer.Library.Web.Tests\Offer.Library.Web.Tests.csproj", "{1694E75F-ABCE-4573-B805-18ED50F148FD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Linq", "framework\Framework.Linq\Framework.Linq.csproj", "{031237BF-7B2A-4B37-9E37-4D4C575FDD22}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Linq.Tests", "..\tests\framework\Framework.Linq.Tests\Framework.Linq.Tests.csproj", "{4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Models.Tests", "..\tests\framework\Framework.Models.Tests\Framework.Models.Tests.csproj", "{EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ProcessIdentity", "framework\Framework.ProcessIdentity\Framework.ProcessIdentity.csproj", "{4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.PublicInfos", "framework\Framework.PublicInfos\Framework.PublicInfos.csproj", "{47E089E3-E875-4045-9E58-C1223BE899E9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.PublicInfos.Tests", "..\tests\framework\Framework.PublicInfos.Tests\Framework.PublicInfos.Tests.csproj", "{9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Keycloak.Seeding", "keycloak\Keycloak.Seeding\Keycloak.Seeding.csproj", "{E1D41A07-F468-4D13-8185-35F127230B17}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Keycloak.Seeding.Tests", "..\tests\keycloak\Keycloak.Seeding.Tests\Keycloak.Seeding.Tests.csproj", "{A5BEDD89-7280-466E-8D14-EC5E177AAD07}" @@ -174,77 +230,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnboardingServiceProvider.L EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkRegistration.Executor.Tests", "..\tests\processes\NetworkRegistration.Executor.Tests\NetworkRegistration.Executor.Tests.csproj", "{F1A5A73C-2B8C-4959-A128-CC5A8DECCB1B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Logging.Tests", "..\tests\framework\Framework.Logging.Tests\Framework.Logging.Tests.csproj", "{146865E5-7DFF-4CC2-8521-9E22CFCEEA20}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Registration.Common", "registration\Registration.Common\Registration.Common.csproj", "{09EF5799-B375-49F1-B78F-0A94D8109F8B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Keycloak.Authentication.Tests", "..\tests\keycloak\Keycloak.Authentication.Tests\Keycloak.Authentication.Tests.csproj", "{C7ACF748-DEF4-4646-A791-F1DA437CC965}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "web", "{69AF541C-7D45-42CE-BDF4-398EA00ED8A5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.Identity", "web\Web.Identity\Web.Identity.csproj", "{F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.PublicInfos", "web\Web.PublicInfos\Web.PublicInfos.csproj", "{03566938-B926-4D8D-9974-3DB9AF0DCC40}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Processes.ProcessIdentity", "processes\Processes.ProcessIdentity\Processes.ProcessIdentity.csproj", "{943EFA0A-E377-4FE8-89E2-A49C4DC04590}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.PublicInfos.Tests", "..\tests\web\Web.PublicInfos.Tests\Web.PublicInfos.Tests.csproj", "{5B9BC27A-B2D4-4745-8906-0AC4EAC62469}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.Identity.Tests", "..\tests\web\Web.Identity.Tests\Web.Identity.Tests.csproj", "{BAB5053F-A224-4C30-8B49-0F3F7C777852}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.Initialization", "web\Web.Initialization\Web.Initialization.csproj", "{48F11819-C031-4AD1-9805-886A40913061}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Tests.Shared", "..\tests\framework\Framework.Tests.Shared\Framework.Tests.Shared.csproj", "{264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "framework", "framework", "{B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Async", "framework\Framework.Async\Framework.Async.csproj", "{D493239E-05AD-4F61-84F0-BB4F713EAF96}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Cors", "framework\Framework.Cors\Framework.Cors.csproj", "{4A7A3E47-D1A4-4889-A05E-483D444450AB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DateTimeProvider", "framework\Framework.DateTimeProvider\Framework.DateTimeProvider.csproj", "{7AE123CC-44BA-49EC-8410-69AE906EC26F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DBAccess", "framework\Framework.DBAccess\Framework.DBAccess.csproj", "{7289C9E0-3899-4FE7-8777-E6F3722B9840}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DependencyInjection", "framework\Framework.DependencyInjection\Framework.DependencyInjection.csproj", "{FE0CD04C-51D5-4734-9EC7-3A10CF628E03}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ErrorHandling", "framework\Framework.ErrorHandling\Framework.ErrorHandling.csproj", "{54F37552-2429-45B7-B17A-47AD8A2CADA3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ErrorHandling.Web", "framework\Framework.ErrorHandling.Web\Framework.ErrorHandling.Web.csproj", "{88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.HttpClientExtensions", "framework\Framework.HttpClientExtensions\Framework.HttpClientExtensions.csproj", "{BA9866FA-0166-4A91-94AC-D7CD0243F7CF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.IO", "framework\Framework.IO\Framework.IO.csproj", "{27A94CE1-8293-4486-B56A-8E9F167B6D6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Linq", "framework\Framework.Linq\Framework.Linq.csproj", "{4A4CD272-E8E9-4BD0-BA09-01093534EEE3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Logging", "framework\Framework.Logging\Framework.Logging.csproj", "{DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Models", "framework\Framework.Models\Framework.Models.csproj", "{951A2647-BEE0-44D6-B789-3B4A21B1CD63}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Seeding", "framework\Framework.Seeding\Framework.Seeding.csproj", "{BD567482-CAFB-403B-AFE5-8D9CFC773DDC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Swagger", "framework\Framework.Swagger\Framework.Swagger.csproj", "{08051253-1AFB-4966-A572-A60363CD1EF1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Token", "framework\Framework.Token\Framework.Token.csproj", "{FB548843-42C7-408C-94E9-107AA0F1B891}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Web", "framework\Framework.Web\Framework.Web.csproj", "{55C45163-F141-4B2C-8013-39132B8FDCF1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Async.Tests", "..\tests\framework\Framework.Async.Tests\Framework.Async.Tests.csproj", "{60D82034-0160-4283-BBEC-C5AF64FDA585}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.DBAccess.Tests", "..\tests\framework\Framework.DBAccess.Tests\Framework.DBAccess.Tests.csproj", "{408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ErrorHandling.Web.Tests", "..\tests\framework\Framework.ErrorHandling.Web.Tests\Framework.ErrorHandling.Web.Tests.csproj", "{7DB79D93-AC00-4ECD-854A-E6327C0791CE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.IO.Tests", "..\tests\framework\Framework.IO.Tests\Framework.IO.Tests.csproj", "{BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Linq.Tests", "..\tests\framework\Framework.Linq.Tests\Framework.Linq.Tests.csproj", "{64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Logging.Tests", "..\tests\framework\Framework.Logging.Tests\Framework.Logging.Tests.csproj", "{C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Models.Tests", "..\tests\framework\Framework.Models.Tests\Framework.Models.Tests.csproj", "{B733F449-AE22-4B00-9F33-816B2F809EF1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Token.Tests", "..\tests\framework\Framework.Token.Tests\Framework.Token.Tests.csproj", "{562DF697-262E-44DB-B6B5-40395E00D87C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.Web.Tests", "..\tests\framework\Framework.Web.Tests\Framework.Web.Tests.csproj", "{7A6C6A10-DC2E-4A16-8758-1115473F3D94}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.ProcessIdentity.Tests", "..\tests\framework\Framework.ProcessIdentity.Tests\Framework.ProcessIdentity.Tests.csproj", "{996CAB8C-B43A-4E76-B906-034A395C1429}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -268,6 +260,78 @@ Global {06418D5E-5963-4D46-8F09-A0E132721C64}.Release|x64.Build.0 = Release|Any CPU {06418D5E-5963-4D46-8F09-A0E132721C64}.Release|x86.ActiveCfg = Release|Any CPU {06418D5E-5963-4D46-8F09-A0E132721C64}.Release|x86.Build.0 = Release|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Debug|x64.Build.0 = Debug|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Debug|x86.Build.0 = Debug|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Release|Any CPU.Build.0 = Release|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Release|x64.ActiveCfg = Release|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Release|x64.Build.0 = Release|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Release|x86.ActiveCfg = Release|Any CPU + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173}.Release|x86.Build.0 = Release|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Debug|x64.ActiveCfg = Debug|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Debug|x64.Build.0 = Debug|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Debug|x86.ActiveCfg = Debug|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Debug|x86.Build.0 = Debug|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Release|Any CPU.Build.0 = Release|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Release|x64.ActiveCfg = Release|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Release|x64.Build.0 = Release|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Release|x86.ActiveCfg = Release|Any CPU + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA}.Release|x86.Build.0 = Release|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Debug|x64.ActiveCfg = Debug|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Debug|x64.Build.0 = Debug|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Debug|x86.ActiveCfg = Debug|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Debug|x86.Build.0 = Debug|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Release|Any CPU.Build.0 = Release|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Release|x64.ActiveCfg = Release|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Release|x64.Build.0 = Release|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Release|x86.ActiveCfg = Release|Any CPU + {4157A958-5EC3-4A62-8C50-D20753AEB39B}.Release|x86.Build.0 = Release|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Debug|x64.ActiveCfg = Debug|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Debug|x64.Build.0 = Debug|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Debug|x86.ActiveCfg = Debug|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Debug|x86.Build.0 = Debug|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Release|Any CPU.Build.0 = Release|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Release|x64.ActiveCfg = Release|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Release|x64.Build.0 = Release|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Release|x86.ActiveCfg = Release|Any CPU + {367EF094-2B47-48F5-BE0B-829FE5CB905C}.Release|x86.Build.0 = Release|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Debug|x64.ActiveCfg = Debug|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Debug|x64.Build.0 = Debug|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Debug|x86.ActiveCfg = Debug|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Debug|x86.Build.0 = Debug|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Release|Any CPU.Build.0 = Release|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Release|x64.ActiveCfg = Release|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Release|x64.Build.0 = Release|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Release|x86.ActiveCfg = Release|Any CPU + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11}.Release|x86.Build.0 = Release|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Debug|x64.ActiveCfg = Debug|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Debug|x64.Build.0 = Debug|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Debug|x86.ActiveCfg = Debug|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Debug|x86.Build.0 = Debug|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Release|Any CPU.Build.0 = Release|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Release|x64.ActiveCfg = Release|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Release|x64.Build.0 = Release|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Release|x86.ActiveCfg = Release|Any CPU + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56}.Release|x86.Build.0 = Release|Any CPU {69004CBA-5B0C-42C7-A4DA-4727F14AA20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {69004CBA-5B0C-42C7-A4DA-4727F14AA20A}.Debug|Any CPU.Build.0 = Debug|Any CPU {69004CBA-5B0C-42C7-A4DA-4727F14AA20A}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -520,6 +584,18 @@ Global {1EFC9D98-C8EE-4399-9B2D-876CDDE8CFD3}.Release|x64.Build.0 = Release|Any CPU {1EFC9D98-C8EE-4399-9B2D-876CDDE8CFD3}.Release|x86.ActiveCfg = Release|Any CPU {1EFC9D98-C8EE-4399-9B2D-876CDDE8CFD3}.Release|x86.Build.0 = Release|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Debug|x64.ActiveCfg = Debug|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Debug|x64.Build.0 = Debug|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Debug|x86.ActiveCfg = Debug|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Debug|x86.Build.0 = Debug|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Release|Any CPU.Build.0 = Release|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Release|x64.ActiveCfg = Release|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Release|x64.Build.0 = Release|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Release|x86.ActiveCfg = Release|Any CPU + {FB2E573E-23BD-4111-A3E5-2C75B9920946}.Release|x86.Build.0 = Release|Any CPU {F0EFB95B-39DD-4FDB-A044-0BB9302DDC41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F0EFB95B-39DD-4FDB-A044-0BB9302DDC41}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0EFB95B-39DD-4FDB-A044-0BB9302DDC41}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -628,6 +704,42 @@ Global {2B1218E4-E1A4-418E-A55F-16B7F30235A7}.Release|x64.Build.0 = Release|Any CPU {2B1218E4-E1A4-418E-A55F-16B7F30235A7}.Release|x86.ActiveCfg = Release|Any CPU {2B1218E4-E1A4-418E-A55F-16B7F30235A7}.Release|x86.Build.0 = Release|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Debug|x64.ActiveCfg = Debug|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Debug|x64.Build.0 = Debug|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Debug|x86.ActiveCfg = Debug|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Debug|x86.Build.0 = Debug|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Release|Any CPU.Build.0 = Release|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Release|x64.ActiveCfg = Release|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Release|x64.Build.0 = Release|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Release|x86.ActiveCfg = Release|Any CPU + {A1862697-AB25-4D79-B601-02733A3490B2}.Release|x86.Build.0 = Release|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Debug|x64.ActiveCfg = Debug|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Debug|x64.Build.0 = Debug|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Debug|x86.ActiveCfg = Debug|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Debug|x86.Build.0 = Debug|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Release|Any CPU.Build.0 = Release|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Release|x64.ActiveCfg = Release|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Release|x64.Build.0 = Release|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Release|x86.ActiveCfg = Release|Any CPU + {2E0BC264-3EB6-4EC2-B332-0F0E50180401}.Release|x86.Build.0 = Release|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Debug|x64.ActiveCfg = Debug|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Debug|x64.Build.0 = Debug|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Debug|x86.ActiveCfg = Debug|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Debug|x86.Build.0 = Debug|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Release|Any CPU.Build.0 = Release|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Release|x64.ActiveCfg = Release|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Release|x64.Build.0 = Release|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Release|x86.ActiveCfg = Release|Any CPU + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E}.Release|x86.Build.0 = Release|Any CPU {3F7A02D4-073C-40FE-B228-8E1BA96B1946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F7A02D4-073C-40FE-B228-8E1BA96B1946}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F7A02D4-073C-40FE-B228-8E1BA96B1946}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -640,6 +752,30 @@ Global {3F7A02D4-073C-40FE-B228-8E1BA96B1946}.Release|x64.Build.0 = Release|Any CPU {3F7A02D4-073C-40FE-B228-8E1BA96B1946}.Release|x86.ActiveCfg = Release|Any CPU {3F7A02D4-073C-40FE-B228-8E1BA96B1946}.Release|x86.Build.0 = Release|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Debug|x64.ActiveCfg = Debug|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Debug|x64.Build.0 = Debug|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Debug|x86.ActiveCfg = Debug|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Debug|x86.Build.0 = Debug|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Release|Any CPU.Build.0 = Release|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Release|x64.ActiveCfg = Release|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Release|x64.Build.0 = Release|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Release|x86.ActiveCfg = Release|Any CPU + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F}.Release|x86.Build.0 = Release|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Debug|x64.ActiveCfg = Debug|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Debug|x64.Build.0 = Debug|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Debug|x86.ActiveCfg = Debug|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Debug|x86.Build.0 = Debug|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Release|Any CPU.Build.0 = Release|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Release|x64.ActiveCfg = Release|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Release|x64.Build.0 = Release|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Release|x86.ActiveCfg = Release|Any CPU + {4316375F-361B-49D6-A310-08CD96D04398}.Release|x86.Build.0 = Release|Any CPU {0C039C14-74CA-484C-B8D9-A307C97EC312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C039C14-74CA-484C-B8D9-A307C97EC312}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C039C14-74CA-484C-B8D9-A307C97EC312}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -664,6 +800,42 @@ Global {3828FF08-4CD7-4FF8-B94A-ED5D5FFA0382}.Release|x64.Build.0 = Release|Any CPU {3828FF08-4CD7-4FF8-B94A-ED5D5FFA0382}.Release|x86.ActiveCfg = Release|Any CPU {3828FF08-4CD7-4FF8-B94A-ED5D5FFA0382}.Release|x86.Build.0 = Release|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Debug|x64.ActiveCfg = Debug|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Debug|x64.Build.0 = Debug|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Debug|x86.ActiveCfg = Debug|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Debug|x86.Build.0 = Debug|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Release|Any CPU.Build.0 = Release|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Release|x64.ActiveCfg = Release|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Release|x64.Build.0 = Release|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Release|x86.ActiveCfg = Release|Any CPU + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A}.Release|x86.Build.0 = Release|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Debug|Any CPU.Build.0 = Debug|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Debug|x64.ActiveCfg = Debug|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Debug|x64.Build.0 = Debug|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Debug|x86.ActiveCfg = Debug|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Debug|x86.Build.0 = Debug|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Release|Any CPU.Build.0 = Release|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Release|x64.ActiveCfg = Release|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Release|x64.Build.0 = Release|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Release|x86.ActiveCfg = Release|Any CPU + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669}.Release|x86.Build.0 = Release|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Debug|x64.ActiveCfg = Debug|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Debug|x64.Build.0 = Debug|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Debug|x86.ActiveCfg = Debug|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Debug|x86.Build.0 = Debug|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Release|Any CPU.Build.0 = Release|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Release|x64.ActiveCfg = Release|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Release|x64.Build.0 = Release|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Release|x86.ActiveCfg = Release|Any CPU + {D577BF62-519F-4AF7-B317-47B144186144}.Release|x86.Build.0 = Release|Any CPU {8B7D8210-05A4-4C0A-AB19-D695E6E97281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B7D8210-05A4-4C0A-AB19-D695E6E97281}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B7D8210-05A4-4C0A-AB19-D695E6E97281}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -760,6 +932,30 @@ Global {79118108-4654-4D71-8B04-C83FCF5C4EBA}.Release|x64.Build.0 = Release|Any CPU {79118108-4654-4D71-8B04-C83FCF5C4EBA}.Release|x86.ActiveCfg = Release|Any CPU {79118108-4654-4D71-8B04-C83FCF5C4EBA}.Release|x86.Build.0 = Release|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Debug|x64.ActiveCfg = Debug|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Debug|x64.Build.0 = Debug|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Debug|x86.ActiveCfg = Debug|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Debug|x86.Build.0 = Debug|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Release|Any CPU.Build.0 = Release|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Release|x64.ActiveCfg = Release|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Release|x64.Build.0 = Release|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Release|x86.ActiveCfg = Release|Any CPU + {DF65D45B-7779-4575-9CE8-0675C84A2495}.Release|x86.Build.0 = Release|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Debug|x64.ActiveCfg = Debug|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Debug|x64.Build.0 = Debug|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Debug|x86.ActiveCfg = Debug|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Debug|x86.Build.0 = Debug|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Release|Any CPU.Build.0 = Release|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Release|x64.ActiveCfg = Release|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Release|x64.Build.0 = Release|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Release|x86.ActiveCfg = Release|Any CPU + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D}.Release|x86.Build.0 = Release|Any CPU {5BA98BC4-941A-4911-9479-EA4ED48D6FF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5BA98BC4-941A-4911-9479-EA4ED48D6FF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {5BA98BC4-941A-4911-9479-EA4ED48D6FF3}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -832,6 +1028,18 @@ Global {96D96CA7-35C0-40C6-A8C8-91E0C4456660}.Release|x64.Build.0 = Release|Any CPU {96D96CA7-35C0-40C6-A8C8-91E0C4456660}.Release|x86.ActiveCfg = Release|Any CPU {96D96CA7-35C0-40C6-A8C8-91E0C4456660}.Release|x86.Build.0 = Release|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Debug|x64.Build.0 = Debug|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Debug|x86.Build.0 = Debug|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Release|Any CPU.Build.0 = Release|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Release|x64.ActiveCfg = Release|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Release|x64.Build.0 = Release|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Release|x86.ActiveCfg = Release|Any CPU + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73}.Release|x86.Build.0 = Release|Any CPU {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -844,6 +1052,18 @@ Global {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}.Release|x64.Build.0 = Release|Any CPU {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}.Release|x86.ActiveCfg = Release|Any CPU {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0}.Release|x86.Build.0 = Release|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Debug|x64.ActiveCfg = Debug|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Debug|x64.Build.0 = Debug|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Debug|x86.ActiveCfg = Debug|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Debug|x86.Build.0 = Debug|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Release|Any CPU.Build.0 = Release|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Release|x64.ActiveCfg = Release|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Release|x64.Build.0 = Release|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Release|x86.ActiveCfg = Release|Any CPU + {4B13E087-E789-4A8D-BE06-5461FA4900A5}.Release|x86.Build.0 = Release|Any CPU {527A4A82-D63A-4DD5-B37D-0AC8A79F1B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {527A4A82-D63A-4DD5-B37D-0AC8A79F1B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {527A4A82-D63A-4DD5-B37D-0AC8A79F1B0E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -904,6 +1124,30 @@ Global {7985B208-CE41-49DA-B749-B94B582612E6}.Release|x64.Build.0 = Release|Any CPU {7985B208-CE41-49DA-B749-B94B582612E6}.Release|x86.ActiveCfg = Release|Any CPU {7985B208-CE41-49DA-B749-B94B582612E6}.Release|x86.Build.0 = Release|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Debug|x64.ActiveCfg = Debug|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Debug|x64.Build.0 = Debug|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Debug|x86.ActiveCfg = Debug|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Debug|x86.Build.0 = Debug|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Release|Any CPU.Build.0 = Release|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Release|x64.ActiveCfg = Release|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Release|x64.Build.0 = Release|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Release|x86.ActiveCfg = Release|Any CPU + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C}.Release|x86.Build.0 = Release|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Debug|x64.ActiveCfg = Debug|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Debug|x64.Build.0 = Debug|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Debug|x86.ActiveCfg = Debug|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Debug|x86.Build.0 = Debug|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Release|Any CPU.Build.0 = Release|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Release|x64.ActiveCfg = Release|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Release|x64.Build.0 = Release|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Release|x86.ActiveCfg = Release|Any CPU + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042}.Release|x86.Build.0 = Release|Any CPU {15BA8836-E9FE-4F64-AD97-261A524779A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15BA8836-E9FE-4F64-AD97-261A524779A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {15BA8836-E9FE-4F64-AD97-261A524779A5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1012,6 +1256,78 @@ Global {1694E75F-ABCE-4573-B805-18ED50F148FD}.Release|x64.Build.0 = Release|Any CPU {1694E75F-ABCE-4573-B805-18ED50F148FD}.Release|x86.ActiveCfg = Release|Any CPU {1694E75F-ABCE-4573-B805-18ED50F148FD}.Release|x86.Build.0 = Release|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Debug|x64.ActiveCfg = Debug|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Debug|x64.Build.0 = Debug|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Debug|x86.ActiveCfg = Debug|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Debug|x86.Build.0 = Debug|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Release|Any CPU.Build.0 = Release|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Release|x64.ActiveCfg = Release|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Release|x64.Build.0 = Release|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Release|x86.ActiveCfg = Release|Any CPU + {031237BF-7B2A-4B37-9E37-4D4C575FDD22}.Release|x86.Build.0 = Release|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Debug|x64.ActiveCfg = Debug|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Debug|x64.Build.0 = Debug|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Debug|x86.ActiveCfg = Debug|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Debug|x86.Build.0 = Debug|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|Any CPU.Build.0 = Release|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x64.ActiveCfg = Release|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x64.Build.0 = Release|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x86.ActiveCfg = Release|Any CPU + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B}.Release|x86.Build.0 = Release|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|x64.ActiveCfg = Debug|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|x64.Build.0 = Debug|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|x86.ActiveCfg = Debug|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Debug|x86.Build.0 = Debug|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Release|Any CPU.Build.0 = Release|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Release|x64.ActiveCfg = Release|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Release|x64.Build.0 = Release|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Release|x86.ActiveCfg = Release|Any CPU + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82}.Release|x86.Build.0 = Release|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Debug|x64.ActiveCfg = Debug|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Debug|x64.Build.0 = Debug|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Debug|x86.ActiveCfg = Debug|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Debug|x86.Build.0 = Debug|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Release|Any CPU.Build.0 = Release|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Release|x64.ActiveCfg = Release|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Release|x64.Build.0 = Release|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Release|x86.ActiveCfg = Release|Any CPU + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A}.Release|x86.Build.0 = Release|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Debug|x64.ActiveCfg = Debug|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Debug|x64.Build.0 = Debug|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Debug|x86.ActiveCfg = Debug|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Debug|x86.Build.0 = Debug|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Release|Any CPU.Build.0 = Release|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Release|x64.ActiveCfg = Release|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Release|x64.Build.0 = Release|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Release|x86.ActiveCfg = Release|Any CPU + {47E089E3-E875-4045-9E58-C1223BE899E9}.Release|x86.Build.0 = Release|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Debug|x64.ActiveCfg = Debug|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Debug|x64.Build.0 = Debug|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Debug|x86.Build.0 = Debug|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Release|Any CPU.Build.0 = Release|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Release|x64.ActiveCfg = Release|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Release|x64.Build.0 = Release|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Release|x86.ActiveCfg = Release|Any CPU + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3}.Release|x86.Build.0 = Release|Any CPU {E1D41A07-F468-4D13-8185-35F127230B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1D41A07-F468-4D13-8185-35F127230B17}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1D41A07-F468-4D13-8185-35F127230B17}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1144,18 +1460,18 @@ Global {F1A5A73C-2B8C-4959-A128-CC5A8DECCB1B}.Release|x64.Build.0 = Release|Any CPU {F1A5A73C-2B8C-4959-A128-CC5A8DECCB1B}.Release|x86.ActiveCfg = Release|Any CPU {F1A5A73C-2B8C-4959-A128-CC5A8DECCB1B}.Release|x86.Build.0 = Release|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Debug|x64.ActiveCfg = Debug|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Debug|x64.Build.0 = Debug|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Debug|x86.ActiveCfg = Debug|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Debug|x86.Build.0 = Debug|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Release|Any CPU.Build.0 = Release|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Release|x64.ActiveCfg = Release|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Release|x64.Build.0 = Release|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Release|x86.ActiveCfg = Release|Any CPU - {571DA63A-6B96-4C6C-8D82-D2C1F10BDAE5}.Release|x86.Build.0 = Release|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Debug|x64.ActiveCfg = Debug|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Debug|x64.Build.0 = Debug|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Debug|x86.ActiveCfg = Debug|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Debug|x86.Build.0 = Debug|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Release|Any CPU.ActiveCfg = Release|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Release|Any CPU.Build.0 = Release|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Release|x64.ActiveCfg = Release|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Release|x64.Build.0 = Release|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Release|x86.ActiveCfg = Release|Any CPU + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20}.Release|x86.Build.0 = Release|Any CPU {09EF5799-B375-49F1-B78F-0A94D8109F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09EF5799-B375-49F1-B78F-0A94D8109F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU {09EF5799-B375-49F1-B78F-0A94D8109F8B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1180,390 +1496,18 @@ Global {C7ACF748-DEF4-4646-A791-F1DA437CC965}.Release|x64.Build.0 = Release|Any CPU {C7ACF748-DEF4-4646-A791-F1DA437CC965}.Release|x86.ActiveCfg = Release|Any CPU {C7ACF748-DEF4-4646-A791-F1DA437CC965}.Release|x86.Build.0 = Release|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Debug|x64.ActiveCfg = Debug|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Debug|x64.Build.0 = Debug|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Debug|x86.ActiveCfg = Debug|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Debug|x86.Build.0 = Debug|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Release|Any CPU.Build.0 = Release|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Release|x64.ActiveCfg = Release|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Release|x64.Build.0 = Release|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Release|x86.ActiveCfg = Release|Any CPU - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723}.Release|x86.Build.0 = Release|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Debug|x64.ActiveCfg = Debug|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Debug|x64.Build.0 = Debug|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Debug|x86.ActiveCfg = Debug|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Debug|x86.Build.0 = Debug|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Release|Any CPU.Build.0 = Release|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Release|x64.ActiveCfg = Release|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Release|x64.Build.0 = Release|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Release|x86.ActiveCfg = Release|Any CPU - {03566938-B926-4D8D-9974-3DB9AF0DCC40}.Release|x86.Build.0 = Release|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Debug|Any CPU.Build.0 = Debug|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Debug|x64.ActiveCfg = Debug|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Debug|x64.Build.0 = Debug|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Debug|x86.ActiveCfg = Debug|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Debug|x86.Build.0 = Debug|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Release|Any CPU.ActiveCfg = Release|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Release|Any CPU.Build.0 = Release|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Release|x64.ActiveCfg = Release|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Release|x64.Build.0 = Release|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Release|x86.ActiveCfg = Release|Any CPU - {943EFA0A-E377-4FE8-89E2-A49C4DC04590}.Release|x86.Build.0 = Release|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Debug|x64.ActiveCfg = Debug|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Debug|x64.Build.0 = Debug|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Debug|x86.ActiveCfg = Debug|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Debug|x86.Build.0 = Debug|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Release|x64.ActiveCfg = Release|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Release|x64.Build.0 = Release|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Release|x86.ActiveCfg = Release|Any CPU - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469}.Release|x86.Build.0 = Release|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Debug|x64.ActiveCfg = Debug|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Debug|x64.Build.0 = Debug|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Debug|x86.ActiveCfg = Debug|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Debug|x86.Build.0 = Debug|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Release|x64.ActiveCfg = Release|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Release|x64.Build.0 = Release|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Release|x86.ActiveCfg = Release|Any CPU - {BAB5053F-A224-4C30-8B49-0F3F7C777852}.Release|x86.Build.0 = Release|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Debug|x64.ActiveCfg = Debug|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Debug|x64.Build.0 = Debug|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Debug|x86.ActiveCfg = Debug|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Debug|x86.Build.0 = Debug|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Release|Any CPU.Build.0 = Release|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Release|x64.ActiveCfg = Release|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Release|x64.Build.0 = Release|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Release|x86.ActiveCfg = Release|Any CPU - {48F11819-C031-4AD1-9805-886A40913061}.Release|x86.Build.0 = Release|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Debug|x64.ActiveCfg = Debug|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Debug|x64.Build.0 = Debug|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Debug|x86.ActiveCfg = Debug|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Debug|x86.Build.0 = Debug|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Release|Any CPU.Build.0 = Release|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Release|x64.ActiveCfg = Release|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Release|x64.Build.0 = Release|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Release|x86.ActiveCfg = Release|Any CPU - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B}.Release|x86.Build.0 = Release|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Debug|x64.ActiveCfg = Debug|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Debug|x64.Build.0 = Debug|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Debug|x86.ActiveCfg = Debug|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Debug|x86.Build.0 = Debug|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Release|Any CPU.Build.0 = Release|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Release|x64.ActiveCfg = Release|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Release|x64.Build.0 = Release|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Release|x86.ActiveCfg = Release|Any CPU - {D493239E-05AD-4F61-84F0-BB4F713EAF96}.Release|x86.Build.0 = Release|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Debug|x64.ActiveCfg = Debug|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Debug|x64.Build.0 = Debug|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Debug|x86.ActiveCfg = Debug|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Debug|x86.Build.0 = Debug|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Release|Any CPU.Build.0 = Release|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Release|x64.ActiveCfg = Release|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Release|x64.Build.0 = Release|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Release|x86.ActiveCfg = Release|Any CPU - {4A7A3E47-D1A4-4889-A05E-483D444450AB}.Release|x86.Build.0 = Release|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Debug|x64.ActiveCfg = Debug|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Debug|x64.Build.0 = Debug|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Debug|x86.ActiveCfg = Debug|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Debug|x86.Build.0 = Debug|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Release|Any CPU.Build.0 = Release|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Release|x64.ActiveCfg = Release|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Release|x64.Build.0 = Release|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Release|x86.ActiveCfg = Release|Any CPU - {7AE123CC-44BA-49EC-8410-69AE906EC26F}.Release|x86.Build.0 = Release|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Debug|x64.ActiveCfg = Debug|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Debug|x64.Build.0 = Debug|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Debug|x86.ActiveCfg = Debug|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Debug|x86.Build.0 = Debug|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Release|Any CPU.Build.0 = Release|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Release|x64.ActiveCfg = Release|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Release|x64.Build.0 = Release|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Release|x86.ActiveCfg = Release|Any CPU - {7289C9E0-3899-4FE7-8777-E6F3722B9840}.Release|x86.Build.0 = Release|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Debug|x64.ActiveCfg = Debug|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Debug|x64.Build.0 = Debug|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Debug|x86.ActiveCfg = Debug|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Debug|x86.Build.0 = Debug|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Release|Any CPU.Build.0 = Release|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Release|x64.ActiveCfg = Release|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Release|x64.Build.0 = Release|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Release|x86.ActiveCfg = Release|Any CPU - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03}.Release|x86.Build.0 = Release|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Debug|x64.ActiveCfg = Debug|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Debug|x64.Build.0 = Debug|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Debug|x86.ActiveCfg = Debug|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Debug|x86.Build.0 = Debug|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Release|Any CPU.Build.0 = Release|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Release|x64.ActiveCfg = Release|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Release|x64.Build.0 = Release|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Release|x86.ActiveCfg = Release|Any CPU - {54F37552-2429-45B7-B17A-47AD8A2CADA3}.Release|x86.Build.0 = Release|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Debug|x64.ActiveCfg = Debug|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Debug|x64.Build.0 = Debug|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Debug|x86.ActiveCfg = Debug|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Debug|x86.Build.0 = Debug|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Release|Any CPU.Build.0 = Release|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Release|x64.ActiveCfg = Release|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Release|x64.Build.0 = Release|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Release|x86.ActiveCfg = Release|Any CPU - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0}.Release|x86.Build.0 = Release|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Debug|x64.ActiveCfg = Debug|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Debug|x64.Build.0 = Debug|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Debug|x86.ActiveCfg = Debug|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Debug|x86.Build.0 = Debug|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Release|Any CPU.Build.0 = Release|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Release|x64.ActiveCfg = Release|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Release|x64.Build.0 = Release|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Release|x86.ActiveCfg = Release|Any CPU - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF}.Release|x86.Build.0 = Release|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Debug|x64.ActiveCfg = Debug|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Debug|x64.Build.0 = Debug|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Debug|x86.ActiveCfg = Debug|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Debug|x86.Build.0 = Debug|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Release|Any CPU.Build.0 = Release|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Release|x64.ActiveCfg = Release|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Release|x64.Build.0 = Release|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Release|x86.ActiveCfg = Release|Any CPU - {27A94CE1-8293-4486-B56A-8E9F167B6D6B}.Release|x86.Build.0 = Release|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Debug|x64.ActiveCfg = Debug|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Debug|x64.Build.0 = Debug|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Debug|x86.ActiveCfg = Debug|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Debug|x86.Build.0 = Debug|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Release|Any CPU.Build.0 = Release|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Release|x64.ActiveCfg = Release|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Release|x64.Build.0 = Release|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Release|x86.ActiveCfg = Release|Any CPU - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3}.Release|x86.Build.0 = Release|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Debug|x64.ActiveCfg = Debug|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Debug|x64.Build.0 = Debug|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Debug|x86.ActiveCfg = Debug|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Debug|x86.Build.0 = Debug|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Release|Any CPU.Build.0 = Release|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Release|x64.ActiveCfg = Release|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Release|x64.Build.0 = Release|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Release|x86.ActiveCfg = Release|Any CPU - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6}.Release|x86.Build.0 = Release|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Debug|x64.ActiveCfg = Debug|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Debug|x64.Build.0 = Debug|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Debug|x86.ActiveCfg = Debug|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Debug|x86.Build.0 = Debug|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Release|Any CPU.Build.0 = Release|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Release|x64.ActiveCfg = Release|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Release|x64.Build.0 = Release|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Release|x86.ActiveCfg = Release|Any CPU - {951A2647-BEE0-44D6-B789-3B4A21B1CD63}.Release|x86.Build.0 = Release|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Debug|x64.Build.0 = Debug|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Debug|x86.Build.0 = Debug|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Release|Any CPU.Build.0 = Release|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Release|x64.ActiveCfg = Release|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Release|x64.Build.0 = Release|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Release|x86.ActiveCfg = Release|Any CPU - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC}.Release|x86.Build.0 = Release|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Debug|x64.ActiveCfg = Debug|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Debug|x64.Build.0 = Debug|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Debug|x86.ActiveCfg = Debug|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Debug|x86.Build.0 = Debug|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Release|Any CPU.Build.0 = Release|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Release|x64.ActiveCfg = Release|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Release|x64.Build.0 = Release|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Release|x86.ActiveCfg = Release|Any CPU - {08051253-1AFB-4966-A572-A60363CD1EF1}.Release|x86.Build.0 = Release|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Debug|x64.ActiveCfg = Debug|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Debug|x64.Build.0 = Debug|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Debug|x86.ActiveCfg = Debug|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Debug|x86.Build.0 = Debug|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Release|Any CPU.Build.0 = Release|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Release|x64.ActiveCfg = Release|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Release|x64.Build.0 = Release|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Release|x86.ActiveCfg = Release|Any CPU - {FB548843-42C7-408C-94E9-107AA0F1B891}.Release|x86.Build.0 = Release|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Debug|x64.ActiveCfg = Debug|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Debug|x64.Build.0 = Debug|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Debug|x86.ActiveCfg = Debug|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Debug|x86.Build.0 = Debug|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Release|Any CPU.Build.0 = Release|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Release|x64.ActiveCfg = Release|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Release|x64.Build.0 = Release|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Release|x86.ActiveCfg = Release|Any CPU - {55C45163-F141-4B2C-8013-39132B8FDCF1}.Release|x86.Build.0 = Release|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Debug|x64.ActiveCfg = Debug|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Debug|x64.Build.0 = Debug|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Debug|x86.ActiveCfg = Debug|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Debug|x86.Build.0 = Debug|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Release|Any CPU.Build.0 = Release|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Release|x64.ActiveCfg = Release|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Release|x64.Build.0 = Release|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Release|x86.ActiveCfg = Release|Any CPU - {60D82034-0160-4283-BBEC-C5AF64FDA585}.Release|x86.Build.0 = Release|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Debug|x64.ActiveCfg = Debug|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Debug|x64.Build.0 = Debug|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Debug|x86.ActiveCfg = Debug|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Debug|x86.Build.0 = Debug|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Release|Any CPU.Build.0 = Release|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Release|x64.ActiveCfg = Release|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Release|x64.Build.0 = Release|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Release|x86.ActiveCfg = Release|Any CPU - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5}.Release|x86.Build.0 = Release|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Debug|x64.ActiveCfg = Debug|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Debug|x64.Build.0 = Debug|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Debug|x86.ActiveCfg = Debug|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Debug|x86.Build.0 = Debug|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Release|Any CPU.Build.0 = Release|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Release|x64.ActiveCfg = Release|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Release|x64.Build.0 = Release|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Release|x86.ActiveCfg = Release|Any CPU - {7DB79D93-AC00-4ECD-854A-E6327C0791CE}.Release|x86.Build.0 = Release|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Debug|x64.ActiveCfg = Debug|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Debug|x64.Build.0 = Debug|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Debug|x86.ActiveCfg = Debug|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Debug|x86.Build.0 = Debug|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Release|Any CPU.Build.0 = Release|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Release|x64.ActiveCfg = Release|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Release|x64.Build.0 = Release|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Release|x86.ActiveCfg = Release|Any CPU - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD}.Release|x86.Build.0 = Release|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Debug|x64.ActiveCfg = Debug|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Debug|x64.Build.0 = Debug|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Debug|x86.ActiveCfg = Debug|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Debug|x86.Build.0 = Debug|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Release|Any CPU.Build.0 = Release|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Release|x64.ActiveCfg = Release|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Release|x64.Build.0 = Release|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Release|x86.ActiveCfg = Release|Any CPU - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3}.Release|x86.Build.0 = Release|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Debug|x64.ActiveCfg = Debug|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Debug|x64.Build.0 = Debug|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Debug|x86.ActiveCfg = Debug|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Debug|x86.Build.0 = Debug|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Release|Any CPU.Build.0 = Release|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Release|x64.ActiveCfg = Release|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Release|x64.Build.0 = Release|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Release|x86.ActiveCfg = Release|Any CPU - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291}.Release|x86.Build.0 = Release|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Debug|x64.ActiveCfg = Debug|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Debug|x64.Build.0 = Debug|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Debug|x86.ActiveCfg = Debug|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Debug|x86.Build.0 = Debug|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Release|Any CPU.Build.0 = Release|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Release|x64.ActiveCfg = Release|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Release|x64.Build.0 = Release|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Release|x86.ActiveCfg = Release|Any CPU - {B733F449-AE22-4B00-9F33-816B2F809EF1}.Release|x86.Build.0 = Release|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Debug|x64.ActiveCfg = Debug|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Debug|x64.Build.0 = Debug|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Debug|x86.ActiveCfg = Debug|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Debug|x86.Build.0 = Debug|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Release|Any CPU.Build.0 = Release|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Release|x64.ActiveCfg = Release|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Release|x64.Build.0 = Release|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Release|x86.ActiveCfg = Release|Any CPU - {562DF697-262E-44DB-B6B5-40395E00D87C}.Release|x86.Build.0 = Release|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Debug|x64.ActiveCfg = Debug|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Debug|x64.Build.0 = Debug|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Debug|x86.ActiveCfg = Debug|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Debug|x86.Build.0 = Debug|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Release|Any CPU.Build.0 = Release|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Release|x64.ActiveCfg = Release|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Release|x64.Build.0 = Release|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Release|x86.ActiveCfg = Release|Any CPU - {7A6C6A10-DC2E-4A16-8758-1115473F3D94}.Release|x86.Build.0 = Release|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Debug|Any CPU.Build.0 = Debug|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Debug|x64.ActiveCfg = Debug|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Debug|x64.Build.0 = Debug|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Debug|x86.ActiveCfg = Debug|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Debug|x86.Build.0 = Debug|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Release|Any CPU.ActiveCfg = Release|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Release|Any CPU.Build.0 = Release|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Release|x64.ActiveCfg = Release|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Release|x64.Build.0 = Release|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Release|x86.ActiveCfg = Release|Any CPU + {996CAB8C-B43A-4E76-B906-034A395C1429}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1572,12 +1516,20 @@ Global SolutionGuid = {2EB6265F-323A-4BF3-969E-003D64A14B64} EndGlobalSection GlobalSection(NestedProjects) = preSolution + {996CAB8C-B43A-4E76-B906-034A395C1429} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {146865E5-7DFF-4CC2-8521-9E22CFCEEA20} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {A43B5ACA-1209-46E9-84DB-A48553ED623E} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {1EAF34DA-6D16-4F5E-86F4-344185F53942} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {A5BEDD89-7280-466E-8D14-EC5E177AAD07} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {EA9BA26E-83F6-47C4-BA3B-880AF1AD6A82} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {4B40193E-2C67-4DC4-8EF4-3286DAA01D8B} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {5E80DEEA-B254-425C-8220-27EEF47C10BD} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {FD7EA0BC-B14C-4315-BDC8-1DD28B717042} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {98BA45B9-30DE-4CB0-BFAB-3FED4B764E1C} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {B787DF92-23F7-410A-B592-95701E4B423D} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {D577BF62-519F-4AF7-B317-47B144186144} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {0C039C14-74CA-484C-B8D9-A307C97EC312} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {2E0BC264-3EB6-4EC2-B332-0F0E50180401} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {2B1218E4-E1A4-418E-A55F-16B7F30235A7} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {6C2F85D7-0443-4711-96DF-66EC46CA1A98} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {217FE6D7-0DE3-43CF-AFC4-7FA12700F447} = {323C198D-A8C6-4EB0-8B79-72624275E35F} @@ -1586,9 +1538,17 @@ Global {F995582E-729F-4EA0-831F-6CA5058114EF} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {12F16E1B-0275-4F41-8353-C2C9A79BA4E9} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {B6DE0855-385D-4A8C-BC22-04BE2105A2F4} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {FB2E573E-23BD-4111-A3E5-2C75B9920946} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {F0EFB95B-39DD-4FDB-A044-0BB9302DDC41} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {1EFC9D98-C8EE-4399-9B2D-876CDDE8CFD3} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {4316375F-361B-49D6-A310-08CD96D04398} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {06418D5E-5963-4D46-8F09-A0E132721C64} = {E0B99F7E-D108-4054-92C2-31304C5060DE} + {AB6C26B2-2EA8-4E19-9A76-EBE0BF097173} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {E6C12BC5-998A-49BD-A737-7C02D14EC5CA} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {4157A958-5EC3-4A62-8C50-D20753AEB39B} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {367EF094-2B47-48F5-BE0B-829FE5CB905C} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {2B5383E4-9A0D-4B19-B4E1-4715EA747B11} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {4E4EC120-2BA0-4D42-AA03-5F9C52CA3C56} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {69004CBA-5B0C-42C7-A4DA-4727F14AA20A} = {46383371-8252-4598-9350-A97692851408} {C482693F-A8D8-40FA-AD93-00B03CA6DC31} = {46383371-8252-4598-9350-A97692851408} {E293EC06-2DEF-41B1-BC96-43918F7BDF59} = {46383371-8252-4598-9350-A97692851408} @@ -1609,8 +1569,13 @@ Global {9E9770D8-D2C8-496C-AB86-3A41CDBAEA47} = {AE4A5C54-72F3-4B55-BB86-09DFA3AA3D7B} {22DEE4A2-15ED-4176-B912-B357D474D2AC} = {AE4A5C54-72F3-4B55-BB86-09DFA3AA3D7B} {FBEA925C-EE3C-4D81-A492-0B2D386C161E} = {AB9C5AA2-DD5D-4A38-97C0-674A995C0AE0} + {A1862697-AB25-4D79-B601-02733A3490B2} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {CF221BA2-1CC2-4E7A-9F8E-4D14975E572E} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {3F7A02D4-073C-40FE-B228-8E1BA96B1946} = {AE4A5C54-72F3-4B55-BB86-09DFA3AA3D7B} + {E45BD4EC-69DD-4890-96E7-E1F3FEFE625F} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {3828FF08-4CD7-4FF8-B94A-ED5D5FFA0382} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {C42A3C0F-21CD-4498-A48F-C1D6BBEAD00A} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {54799CEE-DC66-4B5B-9A2A-3C8732CAB669} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {8B7D8210-05A4-4C0A-AB19-D695E6E97281} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {CF80BBB1-C07D-425C-9A5B-54C5E2890CC4} = {282CEF03-292F-4A49-83C6-997567D0FF5F} {D248909F-DFDF-4001-B9F1-8F3DDB0B7D39} = {282CEF03-292F-4A49-83C6-997567D0FF5F} @@ -1619,13 +1584,17 @@ Global {2192F508-D28A-4E96-A6E8-2565FBDDFD9E} = {C8957230-4203-452C-A085-34091C5E370B} {8AD0B125-C67A-4182-B93B-66BC724A3EE3} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {79118108-4654-4D71-8B04-C83FCF5C4EBA} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {DF65D45B-7779-4575-9CE8-0675C84A2495} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {635FB0C5-3A2F-4A34-AB7A-30FFE3EAF77D} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {5BA98BC4-941A-4911-9479-EA4ED48D6FF3} = {C8957230-4203-452C-A085-34091C5E370B} {4F0E9174-5DB5-42C5-9AA2-4914BDD29AE6} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {7D3D6277-6E91-4F66-AB07-5049A66B5B3D} = {C8957230-4203-452C-A085-34091C5E370B} {A4BF3A98-BE55-4816-991F-086DC3B9E5FB} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {0BFA8C5B-3F15-4381-9621-AD7A3EC0315F} = {AB9C5AA2-DD5D-4A38-97C0-674A995C0AE0} {96D96CA7-35C0-40C6-A8C8-91E0C4456660} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {AB9FC684-E08A-4EEC-9F3A-C256CB2E4D73} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {C3E5E7C8-69D3-4ECB-A4FA-53A9A780EFF0} = {282CEF03-292F-4A49-83C6-997567D0FF5F} + {4B13E087-E789-4A8D-BE06-5461FA4900A5} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} {527A4A82-D63A-4DD5-B37D-0AC8A79F1B0E} = {282CEF03-292F-4A49-83C6-997567D0FF5F} {0221E83B-B26B-442F-ACAD-B1043DF9993A} = {282CEF03-292F-4A49-83C6-997567D0FF5F} {4C7E9EAC-222B-4C13-B8B1-5987406817A0} = {282CEF03-292F-4A49-83C6-997567D0FF5F} @@ -1638,6 +1607,10 @@ Global {58D5C0B4-3C5C-4BE4-82EA-4CB9940943B1} = {282CEF03-292F-4A49-83C6-997567D0FF5F} {EC493B36-9E14-4CAF-973F-FB96FDAF546F} = {A878BDF1-6DB6-4BA5-A724-92885A710856} {1694E75F-ABCE-4573-B805-18ED50F148FD} = {323C198D-A8C6-4EB0-8B79-72624275E35F} + {031237BF-7B2A-4B37-9E37-4D4C575FDD22} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {4CA307AB-A0F8-4AA5-A09D-91F47DA3054A} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {47E089E3-E875-4045-9E58-C1223BE899E9} = {23500169-FC01-4D2B-A997-E7FAE2169FC0} + {9D574E57-75A6-4965-AF23-ACE0BB9CD0B3} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {E1D41A07-F468-4D13-8185-35F127230B17} = {46383371-8252-4598-9350-A97692851408} {6113B579-C995-47F8-9AC1-4CC6EFDDD883} = {68D43DB1-DFC5-4F15-A2B4-6BA18B875F9E} {19639645-A115-4824-865F-5559DA8B892A} = {282CEF03-292F-4A49-83C6-997567D0FF5F} @@ -1648,37 +1621,5 @@ Global {F1A5A73C-2B8C-4959-A128-CC5A8DECCB1B} = {323C198D-A8C6-4EB0-8B79-72624275E35F} {09EF5799-B375-49F1-B78F-0A94D8109F8B} = {AB9C5AA2-DD5D-4A38-97C0-674A995C0AE0} {C7ACF748-DEF4-4646-A791-F1DA437CC965} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {F9AD08D6-8BC8-46B4-9DB0-4C9D3082F723} = {69AF541C-7D45-42CE-BDF4-398EA00ED8A5} - {03566938-B926-4D8D-9974-3DB9AF0DCC40} = {69AF541C-7D45-42CE-BDF4-398EA00ED8A5} - {943EFA0A-E377-4FE8-89E2-A49C4DC04590} = {282CEF03-292F-4A49-83C6-997567D0FF5F} - {5B9BC27A-B2D4-4745-8906-0AC4EAC62469} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {BAB5053F-A224-4C30-8B49-0F3F7C777852} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {48F11819-C031-4AD1-9805-886A40913061} = {69AF541C-7D45-42CE-BDF4-398EA00ED8A5} - {264D03E8-5DA2-49B5-8D2E-A3BF9CCA126B} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {D493239E-05AD-4F61-84F0-BB4F713EAF96} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {4A7A3E47-D1A4-4889-A05E-483D444450AB} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {7AE123CC-44BA-49EC-8410-69AE906EC26F} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {7289C9E0-3899-4FE7-8777-E6F3722B9840} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {FE0CD04C-51D5-4734-9EC7-3A10CF628E03} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {54F37552-2429-45B7-B17A-47AD8A2CADA3} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {88CC87F0-D828-4094-ACD1-6FF2EFBB10B0} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {BA9866FA-0166-4A91-94AC-D7CD0243F7CF} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {27A94CE1-8293-4486-B56A-8E9F167B6D6B} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {4A4CD272-E8E9-4BD0-BA09-01093534EEE3} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {DDEDB340-2C34-4C45-B4F1-CFD2135BD6A6} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {951A2647-BEE0-44D6-B789-3B4A21B1CD63} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {BD567482-CAFB-403B-AFE5-8D9CFC773DDC} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {08051253-1AFB-4966-A572-A60363CD1EF1} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {FB548843-42C7-408C-94E9-107AA0F1B891} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {55C45163-F141-4B2C-8013-39132B8FDCF1} = {B42CFF96-B8DB-48A6-A9CA-72BFB5F0117B} - {60D82034-0160-4283-BBEC-C5AF64FDA585} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {408D1FA2-4C95-47F4-9C01-2CDFFE7BE5A5} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {7DB79D93-AC00-4ECD-854A-E6327C0791CE} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {BB34F6A2-1298-40EF-8216-ADB14B3AEEDD} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {64F69E1F-EDC7-44DA-A178-182C5B3B8DB3} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {C91AB7ED-8BC9-4010-B1B6-5EA6EA5B8291} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {B733F449-AE22-4B00-9F33-816B2F809EF1} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {562DF697-262E-44DB-B6B5-40395E00D87C} = {323C198D-A8C6-4EB0-8B79-72624275E35F} - {7A6C6A10-DC2E-4A16-8758-1115473F3D94} = {323C198D-A8C6-4EB0-8B79-72624275E35F} EndGlobalSection EndGlobal diff --git a/src/administration/Administration.Service/Administration.Service.csproj b/src/administration/Administration.Service/Administration.Service.csproj index 793b3a6284..b30882330e 100644 --- a/src/administration/Administration.Service/Administration.Service.csproj +++ b/src/administration/Administration.Service/Administration.Service.csproj @@ -1,89 +1,85 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Administration.Service - Org.Eclipse.TractusX.Portal.Backend.Administration.Service - net7.0 - enable - enable - ad1c79a3-a042-4d59-8924-475f8ff4c37a - Linux - ..\..\.. - True - CS1591 - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - Program.cs - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Administration.Service + Org.Eclipse.TractusX.Portal.Backend.Administration.Service + net7.0 + enable + enable + ad1c79a3-a042-4d59-8924-475f8ff4c37a + Linux + ..\..\.. + True + CS1591 + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + Program.cs + + + + diff --git a/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs index e9218e7dd0..bf988cad44 100644 --- a/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs +++ b/src/administration/Administration.Service/BusinessLogic/IdentityProviderBusinessLogic.cs @@ -20,7 +20,7 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.IO; using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration; diff --git a/src/administration/Administration.Service/BusinessLogic/UserUploadBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/UserUploadBusinessLogic.cs index 5d88a3d5ac..b4eef9e86a 100644 --- a/src/administration/Administration.Service/BusinessLogic/UserUploadBusinessLogic.cs +++ b/src/administration/Administration.Service/BusinessLogic/UserUploadBusinessLogic.cs @@ -20,7 +20,7 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.IO; using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; diff --git a/src/administration/Administration.Service/Controllers/CompanyDataController.cs b/src/administration/Administration.Service/Controllers/CompanyDataController.cs index 5bea9c452b..96e8ab418e 100644 --- a/src/administration/Administration.Service/Controllers/CompanyDataController.cs +++ b/src/administration/Administration.Service/Controllers/CompanyDataController.cs @@ -22,11 +22,10 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/ConnectorsController.cs b/src/administration/Administration.Service/Controllers/ConnectorsController.cs index 4628aaddb8..08141f2eee 100644 --- a/src/administration/Administration.Service/Controllers/ConnectorsController.cs +++ b/src/administration/Administration.Service/Controllers/ConnectorsController.cs @@ -22,13 +22,12 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/DocumentsController.cs b/src/administration/Administration.Service/Controllers/DocumentsController.cs index 5d103088ef..4cc5c4559b 100644 --- a/src/administration/Administration.Service/Controllers/DocumentsController.cs +++ b/src/administration/Administration.Service/Controllers/DocumentsController.cs @@ -21,11 +21,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs index 8b871ecadc..a147676b5a 100644 --- a/src/administration/Administration.Service/Controllers/IdentityProviderController.cs +++ b/src/administration/Administration.Service/Controllers/IdentityProviderController.cs @@ -22,10 +22,10 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/InvitationController.cs b/src/administration/Administration.Service/Controllers/InvitationController.cs index fe5999eddc..e776a39072 100644 --- a/src/administration/Administration.Service/Controllers/InvitationController.cs +++ b/src/administration/Administration.Service/Controllers/InvitationController.cs @@ -22,8 +22,8 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/NetworkController.cs b/src/administration/Administration.Service/Controllers/NetworkController.cs index b66b6afbba..927c5596e9 100644 --- a/src/administration/Administration.Service/Controllers/NetworkController.cs +++ b/src/administration/Administration.Service/Controllers/NetworkController.cs @@ -21,9 +21,9 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs b/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs index c77174edc2..2b4401abab 100644 --- a/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs +++ b/src/administration/Administration.Service/Controllers/PartnerNetworkController.cs @@ -21,8 +21,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/RegistrationController.cs b/src/administration/Administration.Service/Controllers/RegistrationController.cs index 25eb699f7c..c207cbc016 100644 --- a/src/administration/Administration.Service/Controllers/RegistrationController.cs +++ b/src/administration/Administration.Service/Controllers/RegistrationController.cs @@ -23,12 +23,11 @@ using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs b/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs index 6df5092bcf..6cee82cb16 100644 --- a/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs +++ b/src/administration/Administration.Service/Controllers/RegistrationStatusController.cs @@ -21,9 +21,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs index a99e9aed0e..968ff63355 100644 --- a/src/administration/Administration.Service/Controllers/ServiceAccountController.cs +++ b/src/administration/Administration.Service/Controllers/ServiceAccountController.cs @@ -22,11 +22,10 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs b/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs index 0b98b7ec51..05c1b90a55 100644 --- a/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs +++ b/src/administration/Administration.Service/Controllers/SubscriptionConfigurationController.cs @@ -21,11 +21,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/Controllers/UserController.cs b/src/administration/Administration.Service/Controllers/UserController.cs index e2c45c3996..97fd04db41 100644 --- a/src/administration/Administration.Service/Controllers/UserController.cs +++ b/src/administration/Administration.Service/Controllers/UserController.cs @@ -21,11 +21,10 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Controllers; diff --git a/src/administration/Administration.Service/ErrorHandling/AdministrationConnectorErrorMessageContainer.cs b/src/administration/Administration.Service/ErrorHandling/AdministrationConnectorErrorMessageContainer.cs index 2fb16c97d4..35f3b1a1fd 100644 --- a/src/administration/Administration.Service/ErrorHandling/AdministrationConnectorErrorMessageContainer.cs +++ b/src/administration/Administration.Service/ErrorHandling/AdministrationConnectorErrorMessageContainer.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using System.Collections.Immutable; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.ErrorHandling; diff --git a/src/administration/Administration.Service/ErrorHandling/AdministrationRegistrationErrorMessageContainer.cs b/src/administration/Administration.Service/ErrorHandling/AdministrationRegistrationErrorMessageContainer.cs index 28c9578624..04427b0ce2 100644 --- a/src/administration/Administration.Service/ErrorHandling/AdministrationRegistrationErrorMessageContainer.cs +++ b/src/administration/Administration.Service/ErrorHandling/AdministrationRegistrationErrorMessageContainer.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using System.Collections.Immutable; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.ErrorHandling; diff --git a/src/administration/Administration.Service/ErrorHandling/AdministrationServiceAccountErrorMessageContainer.cs b/src/administration/Administration.Service/ErrorHandling/AdministrationServiceAccountErrorMessageContainer.cs index 7f43b1efaf..8be0025145 100644 --- a/src/administration/Administration.Service/ErrorHandling/AdministrationServiceAccountErrorMessageContainer.cs +++ b/src/administration/Administration.Service/ErrorHandling/AdministrationServiceAccountErrorMessageContainer.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using System.Collections.Immutable; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.ErrorHandling; diff --git a/src/administration/Administration.Service/Program.cs b/src/administration/Administration.Service/Program.cs index e09d67b6fb..960e1f8465 100644 --- a/src/administration/Administration.Service/Program.cs +++ b/src/administration/Administration.Service/Program.cs @@ -21,7 +21,8 @@ using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Web; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.Mailing.Service.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Notifications.Library; @@ -33,17 +34,12 @@ using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Service; -using Org.Eclipse.TractusX.Portal.Backend.Web.Initialization; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; var VERSION = "v2"; -WebAppHelper +WebApplicationBuildRunner .BuildAndRunWebApplication(args, "administration", VERSION, builder => { - builder.Services - .AddPublicInfos(); - builder.Services .AddMailingAndTemplateManager(builder.Configuration) .AddMailingService() diff --git a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj index 4beffd35fb..fe2d1e2f71 100644 --- a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj +++ b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj @@ -1,41 +1,44 @@ - - - - - - net7.0 - enable - enable - Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library - Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library - - - - - - - - - - - - - + + + + + + net7.0 + enable + enable + Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library + Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library + + + + + + + + + + + + + + + + diff --git a/src/externalsystems/Bpdm.Library/BpdmServiceSettings.cs b/src/externalsystems/Bpdm.Library/BpdmServiceSettings.cs index c053efb77c..8bd3c28041 100644 --- a/src/externalsystems/Bpdm.Library/BpdmServiceSettings.cs +++ b/src/externalsystems/Bpdm.Library/BpdmServiceSettings.cs @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.ComponentModel.DataAnnotations; namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library; diff --git a/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs b/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs index ff58dbd844..c364267d40 100644 --- a/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs +++ b/src/externalsystems/Bpdm.Library/DependencyInjection/BpdmServiceCollectionExtension.cs @@ -23,6 +23,7 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.DependencyInjection; @@ -38,7 +39,7 @@ public static IServiceCollection AddBpdmService(this IServiceCollection services var sp = services.BuildServiceProvider(); var settings = sp.GetRequiredService>(); services - .AddCustomHttpClientWithAuthentication(settings.Value.BaseAddress) + .AddCustomHttpClientWithAuthentication(settings.Value.BaseAddress, settings.Value.KeycloakTokenAddress) .AddTransient() .AddTransient(); diff --git a/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs b/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs index db168ef8ea..b474de05db 100644 --- a/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs +++ b/src/externalsystems/Bpdm.Library/DependencyInjection/BpnAccessCollectionExtension.cs @@ -19,7 +19,7 @@ ********************************************************************************/ using Microsoft.Extensions.DependencyInjection; -using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.DependencyInjection; diff --git a/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj b/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj index 62fc338e42..f2e57ab883 100644 --- a/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj +++ b/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj @@ -29,9 +29,15 @@ + + + + + + diff --git a/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs b/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs index ce3b7e91d9..e78ed2b1d3 100644 --- a/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs +++ b/src/externalsystems/Clearinghouse.Library/ClearinghouseServiceCollectionExtension.cs @@ -23,6 +23,7 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; namespace Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library; @@ -38,7 +39,7 @@ public static IServiceCollection AddClearinghouseService(this IServiceCollection var sp = services.BuildServiceProvider(); var settings = sp.GetRequiredService>(); services - .AddCustomHttpClientWithAuthentication(settings.Value.BaseAddress) + .AddCustomHttpClientWithAuthentication(settings.Value.BaseAddress, settings.Value.KeycloakTokenAddress) .AddTransient() .AddTransient(); diff --git a/src/externalsystems/Clearinghouse.Library/ClearinghouseSettings.cs b/src/externalsystems/Clearinghouse.Library/ClearinghouseSettings.cs index 5eb8ad27e7..534b88f71b 100644 --- a/src/externalsystems/Clearinghouse.Library/ClearinghouseSettings.cs +++ b/src/externalsystems/Clearinghouse.Library/ClearinghouseSettings.cs @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.ComponentModel.DataAnnotations; namespace Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library; diff --git a/src/externalsystems/Custodian.Library/Custodian.Library.csproj b/src/externalsystems/Custodian.Library/Custodian.Library.csproj index fe974f470d..8e1622fcb7 100644 --- a/src/externalsystems/Custodian.Library/Custodian.Library.csproj +++ b/src/externalsystems/Custodian.Library/Custodian.Library.csproj @@ -1,41 +1,44 @@ - - - - - - net7.0 - enable - enable - Org.Eclipse.TractusX.Portal.Backend.Custodian.Library - Org.Eclipse.TractusX.Portal.Backend.Custodian.Library - - - - - - - - - - - - - - + + + + + + net7.0 + enable + enable + Org.Eclipse.TractusX.Portal.Backend.Custodian.Library + Org.Eclipse.TractusX.Portal.Backend.Custodian.Library + + + + + + + + + + + + + + + + + diff --git a/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs b/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs index b163ad2275..1e443809c3 100644 --- a/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs +++ b/src/externalsystems/Custodian.Library/CustodianServiceCollectionExtension.cs @@ -23,6 +23,7 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Custodian.Library.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; namespace Org.Eclipse.TractusX.Portal.Backend.Custodian.Library; @@ -37,7 +38,7 @@ public static IServiceCollection AddCustodianService(this IServiceCollection ser var sp = services.BuildServiceProvider(); var settings = sp.GetRequiredService>(); - services.AddCustomHttpClientWithAuthentication(settings.Value.BaseAddress); + services.AddCustomHttpClientWithAuthentication(settings.Value.BaseAddress, settings.Value.KeycloakTokenAddress); services .AddTransient() .AddTransient(); diff --git a/src/externalsystems/Custodian.Library/CustodianSettings.cs b/src/externalsystems/Custodian.Library/CustodianSettings.cs index 1236745539..a82b78d1dd 100644 --- a/src/externalsystems/Custodian.Library/CustodianSettings.cs +++ b/src/externalsystems/Custodian.Library/CustodianSettings.cs @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.ComponentModel.DataAnnotations; namespace Org.Eclipse.TractusX.Portal.Backend.Custodian.Library diff --git a/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs b/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs index 6decb56609..8ba57f2fdc 100644 --- a/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs +++ b/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderServiceCollectionExtension.cs @@ -20,7 +20,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation; using Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library.BusinessLogic; @@ -37,8 +39,10 @@ public static IServiceCollection AddOfferProviderService(this IServiceCollection .ValidateOnStart(); services.AddTransient>(); + var sp = services.BuildServiceProvider(); + var settings = sp.GetRequiredService>(); return services - .AddCustomHttpClientWithAuthentication(null) + .AddCustomHttpClientWithAuthentication(null, settings.Value.KeycloakTokenAddress) .AddTransient() .AddTransient(); } diff --git a/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderSettings.cs b/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderSettings.cs index 1f83471a41..4c18bea064 100644 --- a/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderSettings.cs +++ b/src/externalsystems/OfferProvider.Library/DependencyInjection/OfferProviderSettings.cs @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; using System.ComponentModel.DataAnnotations; namespace Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library.DependencyInjection; diff --git a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj index 2c5cb0546c..28a88517b4 100644 --- a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj +++ b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj @@ -1,36 +1,39 @@ - - - - - - net7.0 - enable - enable - Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library - Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library - - - - - - - - + + + + + + net7.0 + enable + enable + Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library + Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library + + + + + + + + + + + diff --git a/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs b/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs index f388a087f5..5830b8f832 100644 --- a/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs +++ b/src/externalsystems/OnboardingServiceProvider.Library/DependencyInjection/OnboardingServiceProviderServiceCollectionExtension.cs @@ -21,6 +21,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation; namespace Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.DependencyInjection; @@ -37,7 +38,7 @@ public static IServiceCollection AddOnboardingServiceProviderService(this IServi services.AddTransient>(); _ = services.BuildServiceProvider(); return services - .AddCustomHttpClientWithAuthentication(null) + .AddCustomHttpClientWithAuthentication(null, null) .AddTransient() .AddTransient(); } diff --git a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj index 3ca431dc14..5209f070a8 100644 --- a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj +++ b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProvider.Library.csproj @@ -1,35 +1,38 @@ - - - - - - net7.0 - enable - enable - Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library - Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library - - - - - - - + + + + + + net7.0 + enable + enable + Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library + Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library + + + + + + + + + + diff --git a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs index cb2735ffe6..831b90a825 100644 --- a/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs +++ b/src/externalsystems/OnboardingServiceProvider.Library/OnboardingServiceProviderService.cs @@ -19,6 +19,7 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.Models; using System.Net.Http.Json; @@ -42,7 +43,7 @@ public async Task TriggerProviderCallback(OspTriggerDetails ospDetails, On { var settings = new KeyVaultAuthSettings { - TokenAddress = ospDetails.AuthUrl, + KeycloakTokenAddress = ospDetails.AuthUrl, ClientId = ospDetails.ClientId, ClientSecret = ospDetails.ClientSecret }; diff --git a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj index 39fb103b81..cb58ba2de3 100644 --- a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj +++ b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj @@ -1,37 +1,43 @@ - - - - - - net7.0 - enable - enable - Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library - Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library - - - - - - - - - + + + + + + net7.0 + enable + enable + Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library + Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library + + + + + + + + + + + + + + + diff --git a/src/externalsystems/SdFactory.Library/SdFactorySettings.cs b/src/externalsystems/SdFactory.Library/SdFactorySettings.cs index d6919bb7fa..1dd69f9272 100644 --- a/src/externalsystems/SdFactory.Library/SdFactorySettings.cs +++ b/src/externalsystems/SdFactory.Library/SdFactorySettings.cs @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.ComponentModel.DataAnnotations; namespace Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library; diff --git a/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs b/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs index 5c493b6ad3..d76e43802d 100644 --- a/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs +++ b/src/externalsystems/SdFactory.Library/SdServiceCollectionExtension.cs @@ -22,6 +22,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.BusinessLogic; namespace Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library; @@ -38,7 +39,7 @@ public static IServiceCollection AddSdFactoryService(this IServiceCollection ser var sp = services.BuildServiceProvider(); var settings = sp.GetRequiredService>(); services - .AddCustomHttpClientWithAuthentication(settings.Value.SdFactoryUrl) + .AddCustomHttpClientWithAuthentication(settings.Value.SdFactoryUrl, settings.Value.KeycloakTokenAddress) .AddTransient() .AddTransient(); diff --git a/src/framework/Framework.Async/Directory.Build.props b/src/framework/Framework.Async/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Async/Directory.Build.props +++ b/src/framework/Framework.Async/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Async/Framework.Async.csproj b/src/framework/Framework.Async/Framework.Async.csproj index dea78c4165..4c0bfdd935 100644 --- a/src/framework/Framework.Async/Framework.Async.csproj +++ b/src/framework/Framework.Async/Framework.Async.csproj @@ -1,64 +1,28 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Async - Org.Eclipse.TractusX.Portal.Backend.Framework.Async - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Async - Org.Eclipse.TractusX.Portal.Backend.Framework.Async - 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 - - + + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.Async + net7.0 + enable + enable + + diff --git a/src/framework/Framework.Async/README.md b/src/framework/Framework.Async/README.md deleted file mode 100644 index 268f9cc4d3..0000000000 --- a/src/framework/Framework.Async/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Async - -The Catena-X Portal Backend Framework Async library provides a set of useful tools for asynchronous handling. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Async - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.ErrorHandling/Directory.Build.props b/src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj similarity index 60% rename from src/framework/Framework.ErrorHandling/Directory.Build.props rename to src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj index 3f35c3e9a7..f163b9abe8 100644 --- a/src/framework/Framework.ErrorHandling/Directory.Build.props +++ b/src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj @@ -1,5 +1,6 @@ - + + - 1.0.0 - + Org.Eclipse.TractusX.Portal.Backend.Framework.BaseDependencies + net7.0 + enable + enable + + + + + diff --git a/src/framework/Framework.Cors/Directory.Build.props b/src/framework/Framework.Cors/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Cors/Directory.Build.props +++ b/src/framework/Framework.Cors/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Cors/Framework.Cors.csproj b/src/framework/Framework.Cors/Framework.Cors.csproj index 79491dabd5..90ac3ad69e 100644 --- a/src/framework/Framework.Cors/Framework.Cors.csproj +++ b/src/framework/Framework.Cors/Framework.Cors.csproj @@ -1,75 +1,37 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Cors - Org.Eclipse.TractusX.Portal.Backend.Framework.Cors - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Cors - Org.Eclipse.TractusX.Portal.Backend.Framework.Cors - 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.Cors + Org.Eclipse.TractusX.Portal.Backend.Framework.Cors + net7.0 + enable + enable + + + + + + + + + + diff --git a/src/framework/Framework.Cors/README.md b/src/framework/Framework.Cors/README.md deleted file mode 100644 index 1f64d0abcb..0000000000 --- a/src/framework/Framework.Cors/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Cors - -The Catena-X Portal Backend Framework Cors library provides some extensions to setup Cors. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Cors - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DBAccess/Directory.Build.props b/src/framework/Framework.DBAccess/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.DBAccess/Directory.Build.props +++ b/src/framework/Framework.DBAccess/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj index 2311b218f9..7f3b022694 100644 --- a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj +++ b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj @@ -1,70 +1,31 @@ - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess - Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess - Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess - 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.DBAccess + Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess + net7.0 + enable + enable + + + + + diff --git a/src/framework/Framework.DBAccess/README.md b/src/framework/Framework.DBAccess/README.md deleted file mode 100644 index fca7ba2b75..0000000000 --- a/src/framework/Framework.DBAccess/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework DBAccess - -The Catena-X Portal Backend Framework DBAccess library provides a useful set of extensions for database interactions. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DateTimeProvider/Directory.Build.props b/src/framework/Framework.DateTimeProvider/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.DateTimeProvider/Directory.Build.props +++ b/src/framework/Framework.DateTimeProvider/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj index a5a2e918e6..a672a18ab6 100644 --- a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj +++ b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj @@ -1,71 +1,32 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider - Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider - Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider - 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.DateTimeProvider + Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider + net7.0 + enable + enable + + + + + diff --git a/src/framework/Framework.DateTimeProvider/README.md b/src/framework/Framework.DateTimeProvider/README.md deleted file mode 100644 index a3407be4a7..0000000000 --- a/src/framework/Framework.DateTimeProvider/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework DateTimeProvider - -The Catena-X Portal Backend Framework DateTimeProvider library provides a DateTimeProvider for your .NET application. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj b/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj deleted file mode 100644 index 6564a86600..0000000000 --- a/src/framework/Framework.DependencyInjection/Framework.DependencyInjection.csproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection - Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection - Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection - 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 - - - diff --git a/src/framework/Framework.DependencyInjection/IScoped.cs b/src/framework/Framework.DependencyInjection/IScoped.cs deleted file mode 100644 index 3305a2ccaf..0000000000 --- a/src/framework/Framework.DependencyInjection/IScoped.cs +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection; - -/// -/// This is just a marker interface to auto register interfaces -/// -public interface IScoped -{ -} diff --git a/src/framework/Framework.DependencyInjection/ISingleton.cs b/src/framework/Framework.DependencyInjection/ISingleton.cs deleted file mode 100644 index 3dce23f8d8..0000000000 --- a/src/framework/Framework.DependencyInjection/ISingleton.cs +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection; - -/// -/// This is just a marker interface to auto register interfaces -/// -public interface ISingleton -{ -} diff --git a/src/framework/Framework.DependencyInjection/ITransient.cs b/src/framework/Framework.DependencyInjection/ITransient.cs deleted file mode 100644 index 7e8ac0b04e..0000000000 --- a/src/framework/Framework.DependencyInjection/ITransient.cs +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection; - -/// -/// This is just a marker interface to auto register interfaces -/// -public interface ITransient -{ -} diff --git a/src/framework/Framework.DependencyInjection/README.md b/src/framework/Framework.DependencyInjection/README.md deleted file mode 100644 index f7e2a69daf..0000000000 --- a/src/framework/Framework.DependencyInjection/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework DependencyInjection - -The Catena-X Portal Backend Framework DependencyInjection library provides a useful set of extensions to easily setup automatic dependency injection. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DependencyInjection/RegistrationHelper.cs b/src/framework/Framework.DependencyInjection/RegistrationHelper.cs deleted file mode 100644 index e84f709957..0000000000 --- a/src/framework/Framework.DependencyInjection/RegistrationHelper.cs +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -using Microsoft.Extensions.DependencyInjection; - -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection; - -public static class RegistrationHelper -{ - public static IServiceCollection AutoRegister(this IServiceCollection services) => - services.AutoRegister(typeof(ITransient), ServiceLifetime.Transient) - .AutoRegister(typeof(IScoped), ServiceLifetime.Scoped) - .AutoRegister(typeof(ISingleton), ServiceLifetime.Singleton); - - private static IServiceCollection AutoRegister(this IServiceCollection services, Type interfaceType, ServiceLifetime lifetime) - { - var interfaces = AppDomain.CurrentDomain.GetAssemblies() - .SelectMany(s => s.GetTypes()) - .Where(t => t.IsInterface && t != interfaceType && interfaceType.IsAssignableFrom(t)) - .Distinct(); - foreach (var type in interfaces) - { - services.AddRegistration(type, lifetime); - } - - return services; - } - - public static IServiceCollection AddRegistration(this IServiceCollection services, Type interfaceType, ServiceLifetime lifetime) - { - var interfaceTypes = AppDomain.CurrentDomain.GetAssemblies() - .SelectMany(s => s.GetTypes()) - .Where(t => interfaceType.IsAssignableFrom(t) && t is { IsClass: true, IsAbstract: false }) - .Select(t => new - { - Service = t.GetInterfaces().FirstOrDefault(), - Implementation = t - }) - .Where(t => t.Service is not null && interfaceType.IsAssignableFrom(t.Service)) - .Select(t => new - { - Service = t.Service!, - t.Implementation - }); - - foreach (var type in interfaceTypes) - { - services.AddService(type.Service, type.Implementation, lifetime); - } - - return services; - } - - private static IServiceCollection AddService(this IServiceCollection services, Type serviceType, Type implementationType, ServiceLifetime lifetime) => - lifetime switch - { - ServiceLifetime.Transient => services.AddTransient(serviceType, implementationType), - ServiceLifetime.Scoped => services.AddScoped(serviceType, implementationType), - ServiceLifetime.Singleton => services.AddSingleton(serviceType, implementationType), - _ => throw new ArgumentException("Invalid lifeTime", nameof(lifetime)) - }; -} diff --git a/src/framework/Framework.ErrorHandling/ConfigurationException.cs b/src/framework/Framework.ErrorHandling.Library/ConfigurationException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ConfigurationException.cs rename to src/framework/Framework.ErrorHandling.Library/ConfigurationException.cs diff --git a/src/framework/Framework.ErrorHandling/ConfigurationValidation.cs b/src/framework/Framework.ErrorHandling.Library/ConfigurationValidation.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ConfigurationValidation.cs rename to src/framework/Framework.ErrorHandling.Library/ConfigurationValidation.cs diff --git a/src/framework/Framework.ErrorHandling/ConflictException.cs b/src/framework/Framework.ErrorHandling.Library/ConflictException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ConflictException.cs rename to src/framework/Framework.ErrorHandling.Library/ConflictException.cs diff --git a/src/framework/Framework.ErrorHandling/ControllerArgumentException.cs b/src/framework/Framework.ErrorHandling.Library/ControllerArgumentException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ControllerArgumentException.cs rename to src/framework/Framework.ErrorHandling.Library/ControllerArgumentException.cs diff --git a/src/framework/Framework.ErrorHandling/DetailException.cs b/src/framework/Framework.ErrorHandling.Library/DetailException.cs similarity index 99% rename from src/framework/Framework.ErrorHandling/DetailException.cs rename to src/framework/Framework.ErrorHandling.Library/DetailException.cs index 126e6f3a5f..79051f7336 100644 --- a/src/framework/Framework.ErrorHandling/DetailException.cs +++ b/src/framework/Framework.ErrorHandling.Library/DetailException.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using System.Text.RegularExpressions; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; diff --git a/src/framework/Framework.HttpClientExtensions/Directory.Build.props b/src/framework/Framework.ErrorHandling.Library/Directory.Build.props similarity index 94% rename from src/framework/Framework.HttpClientExtensions/Directory.Build.props rename to src/framework/Framework.ErrorHandling.Library/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.HttpClientExtensions/Directory.Build.props +++ b/src/framework/Framework.ErrorHandling.Library/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.ErrorHandling/ErrorDetails.cs b/src/framework/Framework.ErrorHandling.Library/ErrorDetails.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ErrorDetails.cs rename to src/framework/Framework.ErrorHandling.Library/ErrorDetails.cs diff --git a/src/framework/Framework.ErrorHandling/ForbiddenException.cs b/src/framework/Framework.ErrorHandling.Library/ForbiddenException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ForbiddenException.cs rename to src/framework/Framework.ErrorHandling.Library/ForbiddenException.cs diff --git a/src/web/Web.PublicInfos/Web.PublicInfos.csproj b/src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj similarity index 57% rename from src/web/Web.PublicInfos/Web.PublicInfos.csproj rename to src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj index afebd5fe37..0f21d0ca23 100644 --- a/src/web/Web.PublicInfos/Web.PublicInfos.csproj +++ b/src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj @@ -1,4 +1,5 @@ + + - Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos - Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library + Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library net7.0 - enable enable + enable - - - - - - - + - - - + + diff --git a/src/framework/Framework.ErrorHandling/Service/ErrorMessageService.cs b/src/framework/Framework.ErrorHandling.Library/Library/ErrorMessageService.cs similarity index 99% rename from src/framework/Framework.ErrorHandling/Service/ErrorMessageService.cs rename to src/framework/Framework.ErrorHandling.Library/Library/ErrorMessageService.cs index 6cffed3a2b..d1152949a4 100644 --- a/src/framework/Framework.ErrorHandling/Service/ErrorMessageService.cs +++ b/src/framework/Framework.ErrorHandling.Library/Library/ErrorMessageService.cs @@ -19,7 +19,7 @@ using System.Collections.Immutable; -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; public sealed class ErrorMessageService : IErrorMessageService { diff --git a/src/framework/Framework.ErrorHandling/Service/ErrorResponse.cs b/src/framework/Framework.ErrorHandling.Library/Library/ErrorResponse.cs similarity index 98% rename from src/framework/Framework.ErrorHandling/Service/ErrorResponse.cs rename to src/framework/Framework.ErrorHandling.Library/Library/ErrorResponse.cs index d01026605f..7c8e6f782c 100644 --- a/src/framework/Framework.ErrorHandling/Service/ErrorResponse.cs +++ b/src/framework/Framework.ErrorHandling.Library/Library/ErrorResponse.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; public record ErrorResponse( string Type, diff --git a/src/framework/Framework.ErrorHandling/Service/IErrorMessageContainer.cs b/src/framework/Framework.ErrorHandling.Library/Library/IErrorMessageContainer.cs similarity index 98% rename from src/framework/Framework.ErrorHandling/Service/IErrorMessageContainer.cs rename to src/framework/Framework.ErrorHandling.Library/Library/IErrorMessageContainer.cs index ef5e1c1786..b99f56a09f 100644 --- a/src/framework/Framework.ErrorHandling/Service/IErrorMessageContainer.cs +++ b/src/framework/Framework.ErrorHandling.Library/Library/IErrorMessageContainer.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; public interface IErrorMessageContainer { diff --git a/src/framework/Framework.ErrorHandling/Service/IErrorMessageService.cs b/src/framework/Framework.ErrorHandling.Library/Library/IErrorMessageService.cs similarity index 98% rename from src/framework/Framework.ErrorHandling/Service/IErrorMessageService.cs rename to src/framework/Framework.ErrorHandling.Library/Library/IErrorMessageService.cs index 7077df263e..e37c437df5 100644 --- a/src/framework/Framework.ErrorHandling/Service/IErrorMessageService.cs +++ b/src/framework/Framework.ErrorHandling.Library/Library/IErrorMessageService.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; public interface IErrorMessageService { diff --git a/src/framework/Framework.ErrorHandling/NotFoundException.cs b/src/framework/Framework.ErrorHandling.Library/NotFoundException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/NotFoundException.cs rename to src/framework/Framework.ErrorHandling.Library/NotFoundException.cs diff --git a/src/framework/Framework.ErrorHandling/ServiceException.cs b/src/framework/Framework.ErrorHandling.Library/ServiceException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/ServiceException.cs rename to src/framework/Framework.ErrorHandling.Library/ServiceException.cs diff --git a/src/framework/Framework.ErrorHandling/UnexpectedConditionException.cs b/src/framework/Framework.ErrorHandling.Library/UnexpectedConditionException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/UnexpectedConditionException.cs rename to src/framework/Framework.ErrorHandling.Library/UnexpectedConditionException.cs diff --git a/src/framework/Framework.ErrorHandling/UnsupportedMediaTypeException.cs b/src/framework/Framework.ErrorHandling.Library/UnsupportedMediaTypeException.cs similarity index 100% rename from src/framework/Framework.ErrorHandling/UnsupportedMediaTypeException.cs rename to src/framework/Framework.ErrorHandling.Library/UnsupportedMediaTypeException.cs diff --git a/src/framework/Framework.ErrorHandling.Web/Directory.Build.props b/src/framework/Framework.ErrorHandling.Web/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.ErrorHandling.Web/Directory.Build.props +++ b/src/framework/Framework.ErrorHandling.Web/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj index 9b8d670527..1461c070fe 100644 --- a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj +++ b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj @@ -25,59 +25,19 @@ 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 - + + + + + + + + + + + + diff --git a/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs b/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs index e4bb639686..43bdc2fbce 100644 --- a/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs +++ b/src/framework/Framework.ErrorHandling.Web/GeneralHttpErrorHandler.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Serilog.Context; using System.Collections.Immutable; using System.Net; @@ -85,7 +85,6 @@ private static (HttpStatusCode StatusCode, Func (argumentException.ParamName, Enumerable.Repeat(argumentException.Message, 1)); } - else if (error is ControllerArgumentException caException) { statusCode = HttpStatusCode.BadRequest; diff --git a/src/framework/Framework.ErrorHandling.Web/README.md b/src/framework/Framework.ErrorHandling.Web/README.md deleted file mode 100644 index 05e8dab9e0..0000000000 --- a/src/framework/Framework.ErrorHandling.Web/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework ErrorHandling Web - -The Catena-X Portal Backend Framework ErrorHandling Web library provides a general error handler for your asp net core application. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj b/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj deleted file mode 100644 index 8739d99dd4..0000000000 --- a/src/framework/Framework.ErrorHandling/Framework.ErrorHandling.csproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - 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 - - - diff --git a/src/framework/Framework.ErrorHandling/README.md b/src/framework/Framework.ErrorHandling/README.md deleted file mode 100644 index a56cd1f0b5..0000000000 --- a/src/framework/Framework.ErrorHandling/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework ErrorHandling Library - -The Catena-X Portal Backend Framework ErrorHandling Library library provides a useful set of custom exceptions and extensions for error handling. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.DependencyInjection/Directory.Build.props b/src/framework/Framework.HttpClient/Directory.Build.props similarity index 94% rename from src/framework/Framework.DependencyInjection/Directory.Build.props rename to src/framework/Framework.HttpClient/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.DependencyInjection/Directory.Build.props +++ b/src/framework/Framework.HttpClient/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/web/Web.Identity/Web.Identity.csproj b/src/framework/Framework.HttpClient/Framework.HttpClient.csproj similarity index 62% rename from src/web/Web.Identity/Web.Identity.csproj rename to src/framework/Framework.HttpClient/Framework.HttpClient.csproj index a09167c3c3..230e62021d 100644 --- a/src/web/Web.Identity/Web.Identity.csproj +++ b/src/framework/Framework.HttpClient/Framework.HttpClient.csproj @@ -1,4 +1,5 @@ + - Org.Eclipse.TractusX.Portal.Backend.Web.Identity - Org.Eclipse.TractusX.Portal.Backend.Web.Identity + Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClient + Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClient net7.0 enable enable - - + + - - + + diff --git a/src/framework/Framework.HttpClientExtensions/HttpAsyncResponseMessageExtension.cs b/src/framework/Framework.HttpClient/HttpAsyncResponseMessageExtension.cs similarity index 100% rename from src/framework/Framework.HttpClientExtensions/HttpAsyncResponseMessageExtension.cs rename to src/framework/Framework.HttpClient/HttpAsyncResponseMessageExtension.cs diff --git a/src/framework/Framework.HttpClientExtensions/HttpClientExtensions.cs b/src/framework/Framework.HttpClient/HttpClientExtensions.cs similarity index 81% rename from src/framework/Framework.HttpClientExtensions/HttpClientExtensions.cs rename to src/framework/Framework.HttpClient/HttpClientExtensions.cs index e0b19719e1..2d09f54c29 100644 --- a/src/framework/Framework.HttpClientExtensions/HttpClientExtensions.cs +++ b/src/framework/Framework.HttpClient/HttpClientExtensions.cs @@ -19,12 +19,13 @@ ********************************************************************************/ using Microsoft.Extensions.DependencyInjection; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; public static class HttpClientExtensions { - public static IServiceCollection AddCustomHttpClientWithAuthentication(this IServiceCollection services, string? baseAddress) where T : class + public static IServiceCollection AddCustomHttpClientWithAuthentication(this IServiceCollection services, string? baseAddress, string? authAddress) where T : class { services.AddHttpClient(typeof(T).Name, c => { @@ -34,7 +35,13 @@ public static IServiceCollection AddCustomHttpClientWithAuthentication(this I } }).AddHttpMessageHandler>(); - services.AddHttpClient($"{typeof(T).Name}Auth").AddHttpMessageHandler>(); + services.AddHttpClient($"{typeof(T).Name}Auth", c => + { + if (authAddress != null) + { + c.BaseAddress = new Uri(authAddress); + } + }).AddHttpMessageHandler>(); return services; } } diff --git a/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj b/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj deleted file mode 100644 index c37edd0980..0000000000 --- a/src/framework/Framework.HttpClientExtensions/Framework.HttpClientExtensions.csproj +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions - Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions - Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions - 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 - - - diff --git a/src/framework/Framework.HttpClientExtensions/README.md b/src/framework/Framework.HttpClientExtensions/README.md deleted file mode 100644 index 735840e95c..0000000000 --- a/src/framework/Framework.HttpClientExtensions/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework - -The Catena-X Portal Backend Framework HttpClientExtensions library provides a set of useful extensions for the use of HttpClients. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.IO/Directory.Build.props b/src/framework/Framework.IO/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.IO/Directory.Build.props +++ b/src/framework/Framework.IO/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.IO/Framework.IO.csproj b/src/framework/Framework.IO/Framework.IO.csproj index 79d6072fe9..0aa9b386a7 100644 --- a/src/framework/Framework.IO/Framework.IO.csproj +++ b/src/framework/Framework.IO/Framework.IO.csproj @@ -1,77 +1,34 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.IO - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.IO - Org.Eclipse.TractusX.Portal.Backend.Framework.IO - 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.IO + net7.0 + enable + enable + + diff --git a/src/framework/Framework.IO/README.md b/src/framework/Framework.IO/README.md deleted file mode 100644 index f5e04eab8e..0000000000 --- a/src/framework/Framework.IO/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework IO - -The Catena-X Portal Backend Framework IO library provides a useful set of extensions and functionality for file I/O handling. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.IO - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.IO/UrlHelper.cs b/src/framework/Framework.IO/UrlHelper.cs index 5309de783c..4f64847ece 100644 --- a/src/framework/Framework.IO/UrlHelper.cs +++ b/src/framework/Framework.IO/UrlHelper.cs @@ -18,12 +18,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.IO; + using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; using System.Collections.Immutable; using System.Web; -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.IO; - public static class UrlHelper { private static readonly IEnumerable ValidUriSchemes = ImmutableArray.Create("http", "https"); diff --git a/src/framework/Framework.Linq/Directory.Build.props b/src/framework/Framework.Linq/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Linq/Directory.Build.props +++ b/src/framework/Framework.Linq/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Linq/Framework.Linq.csproj b/src/framework/Framework.Linq/Framework.Linq.csproj index 8eb8223cae..9bb144e676 100644 --- a/src/framework/Framework.Linq/Framework.Linq.csproj +++ b/src/framework/Framework.Linq/Framework.Linq.csproj @@ -1,5 +1,5 @@ - - 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 - - diff --git a/src/framework/Framework.Linq/README.md b/src/framework/Framework.Linq/README.md deleted file mode 100644 index 9baac3d067..0000000000 --- a/src/framework/Framework.Linq/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Linq - -The Catena-X Portal Backend Framework Linq library provides a useful set of extensions to work with Linq. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Linq - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Logging/Directory.Build.props b/src/framework/Framework.Logging/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Logging/Directory.Build.props +++ b/src/framework/Framework.Logging/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Logging/Framework.Logging.csproj b/src/framework/Framework.Logging/Framework.Logging.csproj index 6af7967c0a..0504174a44 100644 --- a/src/framework/Framework.Logging/Framework.Logging.csproj +++ b/src/framework/Framework.Logging/Framework.Logging.csproj @@ -1,5 +1,6 @@ - - Org.Eclipse.TractusX.Portal.Backend.Framework.Logging - Org.Eclipse.TractusX.Portal.Backend.Framework.Logging - 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 - + + + + + + + + + + + diff --git a/src/framework/Framework.HttpClientExtensions/LoggingHandler.cs b/src/framework/Framework.Logging/LoggingHandler.cs similarity index 96% rename from src/framework/Framework.HttpClientExtensions/LoggingHandler.cs rename to src/framework/Framework.Logging/LoggingHandler.cs index 36a1b37c85..3008401552 100644 --- a/src/framework/Framework.HttpClientExtensions/LoggingHandler.cs +++ b/src/framework/Framework.Logging/LoggingHandler.cs @@ -20,7 +20,7 @@ using Microsoft.Extensions.Logging; -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; public class LoggingHandler : DelegatingHandler where TLogger : class diff --git a/src/framework/Framework.Logging/README.md b/src/framework/Framework.Logging/README.md deleted file mode 100644 index 57148e1c8f..0000000000 --- a/src/framework/Framework.Logging/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Logging - -The Catena-X Portal Backend Framework Logging library provides a useful set of extensions for the logging with Serilog. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Logging - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Models/Directory.Build.props b/src/framework/Framework.Models/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Models/Directory.Build.props +++ b/src/framework/Framework.Models/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Models/Framework.Models.csproj b/src/framework/Framework.Models/Framework.Models.csproj index 0e1b1a7558..797bf3acf8 100644 --- a/src/framework/Framework.Models/Framework.Models.csproj +++ b/src/framework/Framework.Models/Framework.Models.csproj @@ -1,81 +1,42 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Models - Org.Eclipse.TractusX.Portal.Backend.Framework.Models - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Models - Org.Eclipse.TractusX.Portal.Backend.Framework.Models - TractusX - 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.Models + Org.Eclipse.TractusX.Portal.Backend.Framework.Models + net7.0 + enable + enable + + + + + + + + + + + + + + diff --git a/src/framework/Framework.Token/KeyVaultAuthSettings.cs b/src/framework/Framework.Models/KeyVaultAuthSettings.cs similarity index 92% rename from src/framework/Framework.Token/KeyVaultAuthSettings.cs rename to src/framework/Framework.Models/KeyVaultAuthSettings.cs index 34ba0353fe..c734cc1746 100644 --- a/src/framework/Framework.Token/KeyVaultAuthSettings.cs +++ b/src/framework/Framework.Models/KeyVaultAuthSettings.cs @@ -20,7 +20,7 @@ using System.ComponentModel.DataAnnotations; -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models; public class KeyVaultAuthSettings { @@ -43,5 +43,5 @@ public class KeyVaultAuthSettings public string Scope { get; set; } = null!; [Required(AllowEmptyStrings = false)] - public string TokenAddress { get; set; } = null!; + public string KeycloakTokenAddress { get; set; } = null!; } diff --git a/src/web/Web.Identity/PolicyTypes.cs b/src/framework/Framework.Models/PolicyTypes.cs similarity index 95% rename from src/web/Web.Identity/PolicyTypes.cs rename to src/framework/Framework.Models/PolicyTypes.cs index 09f74c372d..168d3d4c9c 100644 --- a/src/web/Web.Identity/PolicyTypes.cs +++ b/src/framework/Framework.Models/PolicyTypes.cs @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models; public static class PolicyTypes { diff --git a/src/web/Web.Identity/PortalClaimTypes.cs b/src/framework/Framework.Models/PortalClaimTypes.cs similarity index 94% rename from src/web/Web.Identity/PortalClaimTypes.cs rename to src/framework/Framework.Models/PortalClaimTypes.cs index fe08eb80e5..4e59b296c1 100644 --- a/src/web/Web.Identity/PortalClaimTypes.cs +++ b/src/framework/Framework.Models/PortalClaimTypes.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models; public static class PortalClaimTypes { diff --git a/src/framework/Framework.Models/README.md b/src/framework/Framework.Models/README.md deleted file mode 100644 index 7780f70f85..0000000000 --- a/src/framework/Framework.Models/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# Catena-X Portal Backend Framework Models - -The Catena-X Portal Backend Framework Models library provides some base models. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Models - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs b/src/framework/Framework.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs similarity index 97% rename from src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs rename to src/framework/Framework.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs index 063efd6d95..d128f70538 100644 --- a/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs +++ b/src/framework/Framework.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.DependencyInjection; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity.DependencyInjection; public static class ProcessIdentityServiceCollectionExtensions { diff --git a/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentitySettings.cs b/src/framework/Framework.ProcessIdentity/DependencyInjection/ProcessIdentitySettings.cs similarity index 94% rename from src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentitySettings.cs rename to src/framework/Framework.ProcessIdentity/DependencyInjection/ProcessIdentitySettings.cs index 8e752fc1b0..7516d83a90 100644 --- a/src/processes/Processes.ProcessIdentity/DependencyInjection/ProcessIdentitySettings.cs +++ b/src/framework/Framework.ProcessIdentity/DependencyInjection/ProcessIdentitySettings.cs @@ -19,7 +19,7 @@ using System.ComponentModel.DataAnnotations; -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.DependencyInjection; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity.DependencyInjection; public class ProcessIdentitySettings { diff --git a/src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj b/src/framework/Framework.ProcessIdentity/Framework.ProcessIdentity.csproj similarity index 87% rename from src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj rename to src/framework/Framework.ProcessIdentity/Framework.ProcessIdentity.csproj index 8bc9fb4a21..7d736eda1d 100644 --- a/src/processes/Processes.ProcessIdentity/Processes.ProcessIdentity.csproj +++ b/src/framework/Framework.ProcessIdentity/Framework.ProcessIdentity.csproj @@ -22,11 +22,11 @@ net7.0 enable enable - Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity - Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity + Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity + Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity - + diff --git a/src/processes/Processes.ProcessIdentity/IProcessIdentityDataBuilder.cs b/src/framework/Framework.ProcessIdentity/IProcessIdentityDataBuilder.cs similarity index 95% rename from src/processes/Processes.ProcessIdentity/IProcessIdentityDataBuilder.cs rename to src/framework/Framework.ProcessIdentity/IProcessIdentityDataBuilder.cs index ac1aef0e25..938e27c4b7 100644 --- a/src/processes/Processes.ProcessIdentity/IProcessIdentityDataBuilder.cs +++ b/src/framework/Framework.ProcessIdentity/IProcessIdentityDataBuilder.cs @@ -20,7 +20,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; public interface IProcessIdentityDataBuilder : IIdentityData { diff --git a/src/processes/Processes.ProcessIdentity/IProcessIdentityDataDetermination.cs b/src/framework/Framework.ProcessIdentity/IProcessIdentityDataDetermination.cs similarity index 94% rename from src/processes/Processes.ProcessIdentity/IProcessIdentityDataDetermination.cs rename to src/framework/Framework.ProcessIdentity/IProcessIdentityDataDetermination.cs index fd0a04ac78..48fa2dc296 100644 --- a/src/processes/Processes.ProcessIdentity/IProcessIdentityDataDetermination.cs +++ b/src/framework/Framework.ProcessIdentity/IProcessIdentityDataDetermination.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; public interface IProcessIdentityDataDetermination { diff --git a/src/processes/Processes.ProcessIdentity/ProcessIdentityDataBuilder.cs b/src/framework/Framework.ProcessIdentity/ProcessIdentityDataBuilder.cs similarity index 94% rename from src/processes/Processes.ProcessIdentity/ProcessIdentityDataBuilder.cs rename to src/framework/Framework.ProcessIdentity/ProcessIdentityDataBuilder.cs index ddeab6ede0..1a68ef5bb1 100644 --- a/src/processes/Processes.ProcessIdentity/ProcessIdentityDataBuilder.cs +++ b/src/framework/Framework.ProcessIdentity/ProcessIdentityDataBuilder.cs @@ -19,10 +19,10 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.DependencyInjection; -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; public class ProcessIdentityDataBuilder : IProcessIdentityDataBuilder { diff --git a/src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs b/src/framework/Framework.ProcessIdentity/ProcessIdentityDataDetermination.cs similarity index 97% rename from src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs rename to src/framework/Framework.ProcessIdentity/ProcessIdentityDataDetermination.cs index cc04203db4..38191ae5af 100644 --- a/src/processes/Processes.ProcessIdentity/ProcessIdentityDataDetermination.cs +++ b/src/framework/Framework.ProcessIdentity/ProcessIdentityDataDetermination.cs @@ -22,7 +22,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; public class ProcessIdentityDataDetermination : IProcessIdentityDataDetermination { diff --git a/src/processes/Processes.ProcessIdentity/ProcessIdentityService.cs b/src/framework/Framework.ProcessIdentity/ProcessIdentityService.cs similarity index 90% rename from src/processes/Processes.ProcessIdentity/ProcessIdentityService.cs rename to src/framework/Framework.ProcessIdentity/ProcessIdentityService.cs index 1875b5681c..f2a4c0a210 100644 --- a/src/processes/Processes.ProcessIdentity/ProcessIdentityService.cs +++ b/src/framework/Framework.ProcessIdentity/ProcessIdentityService.cs @@ -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. @@ -19,7 +19,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -namespace Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; public class ProcessIdentityService : IIdentityService { diff --git a/src/web/Web.PublicInfos/DependencyInjection/PublicInfosServiceCollectionExtensions.cs b/src/framework/Framework.PublicInfos/DependencyInjection/PublicInfosServiceCollectionExtensions.cs similarity index 93% rename from src/web/Web.PublicInfos/DependencyInjection/PublicInfosServiceCollectionExtensions.cs rename to src/framework/Framework.PublicInfos/DependencyInjection/PublicInfosServiceCollectionExtensions.cs index 4e434180e4..f6287cd1b7 100644 --- a/src/web/Web.PublicInfos/DependencyInjection/PublicInfosServiceCollectionExtensions.cs +++ b/src/framework/Framework.PublicInfos/DependencyInjection/PublicInfosServiceCollectionExtensions.cs @@ -20,7 +20,7 @@ using Microsoft.Extensions.DependencyInjection; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos.DependencyInjection; public static class PublicInfosServiceCollectionExtensions { diff --git a/src/web/Web.Initialization/Web.Initialization.csproj b/src/framework/Framework.PublicInfos/Framework.PublicInfos.csproj similarity index 55% rename from src/web/Web.Initialization/Web.Initialization.csproj rename to src/framework/Framework.PublicInfos/Framework.PublicInfos.csproj index 7923e1b27e..2c7a3e8040 100644 --- a/src/web/Web.Initialization/Web.Initialization.csproj +++ b/src/framework/Framework.PublicInfos/Framework.PublicInfos.csproj @@ -1,38 +1,44 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Web.Initialization - Org.Eclipse.TractusX.Portal.Backend.Web.Initialization - net7.0 - enable - enable - - - - - - - - - - - - + + + + Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos + Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos + net7.0 + enable + enable + + + + + + + + + + + + + + + + + + diff --git a/src/web/Web.PublicInfos/IPublicInformationBusinessLogic.cs b/src/framework/Framework.PublicInfos/IPublicInformationBusinessLogic.cs similarity index 93% rename from src/web/Web.PublicInfos/IPublicInformationBusinessLogic.cs rename to src/framework/Framework.PublicInfos/IPublicInformationBusinessLogic.cs index 343c7acc94..e0d118c4a4 100644 --- a/src/web/Web.PublicInfos/IPublicInformationBusinessLogic.cs +++ b/src/framework/Framework.PublicInfos/IPublicInformationBusinessLogic.cs @@ -18,7 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; public interface IPublicInformationBusinessLogic { diff --git a/src/web/Web.PublicInfos/OpenInformationController.cs b/src/framework/Framework.PublicInfos/OpenInformationController.cs similarity index 94% rename from src/web/Web.PublicInfos/OpenInformationController.cs rename to src/framework/Framework.PublicInfos/OpenInformationController.cs index 47e2cd6825..62dc541810 100644 --- a/src/web/Web.PublicInfos/OpenInformationController.cs +++ b/src/framework/Framework.PublicInfos/OpenInformationController.cs @@ -21,9 +21,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; [ApiController] [Route("api/info")] diff --git a/src/web/Web.PublicInfos/PublicInformationBusinessLogic.cs b/src/framework/Framework.PublicInfos/PublicInformationBusinessLogic.cs similarity index 98% rename from src/web/Web.PublicInfos/PublicInformationBusinessLogic.cs rename to src/framework/Framework.PublicInfos/PublicInformationBusinessLogic.cs index 740a3f9109..36865cc9e2 100644 --- a/src/web/Web.PublicInfos/PublicInformationBusinessLogic.cs +++ b/src/framework/Framework.PublicInfos/PublicInformationBusinessLogic.cs @@ -27,7 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; using System.Reflection; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; public class PublicInformationBusinessLogic : IPublicInformationBusinessLogic { diff --git a/src/web/Web.PublicInfos/PublicUrlAttribute.cs b/src/framework/Framework.PublicInfos/PublicUrlAttribute.cs similarity index 94% rename from src/web/Web.PublicInfos/PublicUrlAttribute.cs rename to src/framework/Framework.PublicInfos/PublicUrlAttribute.cs index 42c64df024..7c16bde307 100644 --- a/src/web/Web.PublicInfos/PublicUrlAttribute.cs +++ b/src/framework/Framework.PublicInfos/PublicUrlAttribute.cs @@ -20,7 +20,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; [AttributeUsage(AttributeTargets.Method)] public class PublicUrlAttribute : Attribute diff --git a/src/web/Web.PublicInfos/UrlInformation.cs b/src/framework/Framework.PublicInfos/UrlInformation.cs similarity index 94% rename from src/web/Web.PublicInfos/UrlInformation.cs rename to src/framework/Framework.PublicInfos/UrlInformation.cs index b3062e7bbb..e1d4e5b2f6 100644 --- a/src/web/Web.PublicInfos/UrlInformation.cs +++ b/src/framework/Framework.PublicInfos/UrlInformation.cs @@ -20,7 +20,7 @@ using System.Text.Json.Serialization; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; public record UrlInformation( [property: JsonPropertyName("httpMethods")] string HttpMethods, diff --git a/src/framework/Framework.Seeding/Directory.Build.props b/src/framework/Framework.Seeding/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Seeding/Directory.Build.props +++ b/src/framework/Framework.Seeding/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Seeding/Framework.Seeding.csproj b/src/framework/Framework.Seeding/Framework.Seeding.csproj index f335a8a004..6a882c48af 100644 --- a/src/framework/Framework.Seeding/Framework.Seeding.csproj +++ b/src/framework/Framework.Seeding/Framework.Seeding.csproj @@ -1,87 +1,49 @@ - - - - - - net7.0 - enable - enable - Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding - Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding - - true - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding - Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding - 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 - - - + + + + + + net7.0 + enable + enable + Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding + Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding + cb89657c-d60e-4f48-aa84-fb03d69dfa78 + + true + + + + + + + + + + + + + + + + + + diff --git a/src/framework/Framework.Seeding/README.md b/src/framework/Framework.Seeding/README.md deleted file mode 100644 index 94ebd6136a..0000000000 --- a/src/framework/Framework.Seeding/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Seeding - -The Catena-X Portal Backend Framework Seeding library provides a useful set of extensions and functionality to setup a json seeding for the use with entity framework. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Seeding/SeederSettings.cs b/src/framework/Framework.Seeding/SeederSettings.cs index 6d43ee114d..8b5b8c1770 100644 --- a/src/framework/Framework.Seeding/SeederSettings.cs +++ b/src/framework/Framework.Seeding/SeederSettings.cs @@ -20,6 +20,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation; using System.ComponentModel.DataAnnotations; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding; @@ -47,6 +48,8 @@ public static IServiceCollection ConfigureSeederSettings( services.AddOptions() .Bind(section) .ValidateDataAnnotations() + .ValidateEnumEnumeration(section) + .ValidateDistinctValues(section) .ValidateOnStart(); return services; } diff --git a/src/framework/Framework.Swagger/Directory.Build.props b/src/framework/Framework.Swagger/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Swagger/Directory.Build.props +++ b/src/framework/Framework.Swagger/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Swagger/Framework.Swagger.csproj b/src/framework/Framework.Swagger/Framework.Swagger.csproj index 55002d3186..a962b85e75 100644 --- a/src/framework/Framework.Swagger/Framework.Swagger.csproj +++ b/src/framework/Framework.Swagger/Framework.Swagger.csproj @@ -1,77 +1,38 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger - Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger - 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.Swagger + net7.0 + enable + enable + + + + + + + + + + + diff --git a/src/framework/Framework.Swagger/README.md b/src/framework/Framework.Swagger/README.md deleted file mode 100644 index 8402abe999..0000000000 --- a/src/framework/Framework.Swagger/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Swagger - -The Catena-X Portal Backend Framework Swagger library provides a useful set of extensions for the use of Swagger. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Token/Directory.Build.props b/src/framework/Framework.Token/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Token/Directory.Build.props +++ b/src/framework/Framework.Token/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Token/Framework.Token.csproj b/src/framework/Framework.Token/Framework.Token.csproj index ff470afc46..dc90fc31f0 100644 --- a/src/framework/Framework.Token/Framework.Token.csproj +++ b/src/framework/Framework.Token/Framework.Token.csproj @@ -1,77 +1,39 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Token - Org.Eclipse.TractusX.Portal.Backend.Framework.Token - net7.0 - enable - enable - true - - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Token - Org.Eclipse.TractusX.Portal.Backend.Framework.Token - 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.Token + Org.Eclipse.TractusX.Portal.Backend.Framework.Token + net7.0 + enable + enable + + + + + + + + + + + + diff --git a/src/framework/Framework.Token/GetTokenSettings.cs b/src/framework/Framework.Token/GetTokenSettings.cs index 528deba20e..800c6ad586 100644 --- a/src/framework/Framework.Token/GetTokenSettings.cs +++ b/src/framework/Framework.Token/GetTokenSettings.cs @@ -19,12 +19,4 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Token; -public record GetTokenSettings( - string HttpClientName, - string Username, - string Password, - string ClientId, - string GrantType, - string ClientSecret, - string Scope, - string TokenUrl); +public record GetTokenSettings(string HttpClientName, string Username, string Password, string ClientId, string GrantType, string ClientSecret, string Scope); diff --git a/src/framework/Framework.Token/ITokenService.cs b/src/framework/Framework.Token/ITokenService.cs index da0481f5f7..9a467e2b63 100644 --- a/src/framework/Framework.Token/ITokenService.cs +++ b/src/framework/Framework.Token/ITokenService.cs @@ -18,9 +18,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; + namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Token; public interface ITokenService { - Task GetAuthorizedClient(KeyVaultAuthSettings settings, CancellationToken cancellationToken); + Task GetAuthorizedClient(KeyVaultAuthSettings settings, CancellationToken cancellationToken); } diff --git a/src/framework/Framework.Token/README.md b/src/framework/Framework.Token/README.md deleted file mode 100644 index a109714e17..0000000000 --- a/src/framework/Framework.Token/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Token - -The Catena-X Portal Backend Framework Token library provides a useful set of extensions and functionality to easily get a authorized HttpClient. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Token - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Token/TokenService.cs b/src/framework/Framework.Token/TokenService.cs index bda9355159..f984e420a8 100644 --- a/src/framework/Framework.Token/TokenService.cs +++ b/src/framework/Framework.Token/TokenService.cs @@ -19,6 +19,7 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.Net.Http.Headers; using System.Text.Json; @@ -42,8 +43,7 @@ public async Task GetAuthorizedClient(KeyVaultAuthSettings settin settings.ClientId, settings.GrantType, settings.ClientSecret, - settings.Scope, - settings.TokenAddress); + settings.Scope); var token = await this.GetTokenAsync(tokenParameters, cancellationToken).ConfigureAwait(false); @@ -64,7 +64,7 @@ public async Task GetAuthorizedClient(KeyVaultAuthSettings settin {"scope", settings.Scope} }; var content = new FormUrlEncodedContent(formParameters); - var response = await _httpClientFactory.CreateClient(settings.HttpClientName).PostAsync(settings.TokenUrl, content, cancellationToken) + var response = await _httpClientFactory.CreateClient(settings.HttpClientName).PostAsync("", content, cancellationToken) .CatchingIntoServiceExceptionFor("token-post", HttpAsyncResponseMessageExtension.RecoverOptions.INFRASTRUCTURE).ConfigureAwait(false); using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false); diff --git a/src/web/Web.Identity/ClaimsIdentityDataBuilder.cs b/src/framework/Framework.Web/ClaimsIdentityDataBuilder.cs similarity index 97% rename from src/web/Web.Identity/ClaimsIdentityDataBuilder.cs rename to src/framework/Framework.Web/ClaimsIdentityDataBuilder.cs index 41dc737690..c43b45a544 100644 --- a/src/web/Web.Identity/ClaimsIdentityDataBuilder.cs +++ b/src/framework/Framework.Web/ClaimsIdentityDataBuilder.cs @@ -20,7 +20,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public class ClaimsIdentityDataBuilder : IClaimsIdentityDataBuilder { diff --git a/src/web/Web.Identity/ClaimsIdentityService.cs b/src/framework/Framework.Web/ClaimsIdentityService.cs similarity index 95% rename from src/web/Web.Identity/ClaimsIdentityService.cs rename to src/framework/Framework.Web/ClaimsIdentityService.cs index a7755ff8dd..9c00457546 100644 --- a/src/web/Web.Identity/ClaimsIdentityService.cs +++ b/src/framework/Framework.Web/ClaimsIdentityService.cs @@ -19,7 +19,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public class ClaimsIdentityService : IIdentityService { diff --git a/src/web/Web.Identity/ClaimsIdentityServiceCollectionExtensions.cs b/src/framework/Framework.Web/ClaimsIdentityServiceCollectionExtensions.cs similarity index 95% rename from src/web/Web.Identity/ClaimsIdentityServiceCollectionExtensions.cs rename to src/framework/Framework.Web/ClaimsIdentityServiceCollectionExtensions.cs index c4d0fddb89..1a2e8e8956 100644 --- a/src/web/Web.Identity/ClaimsIdentityServiceCollectionExtensions.cs +++ b/src/framework/Framework.Web/ClaimsIdentityServiceCollectionExtensions.cs @@ -20,7 +20,7 @@ using Microsoft.Extensions.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public static class ClaimsIdentityServiceCollectionExtensions { diff --git a/src/framework/Framework.Web/Directory.Build.props b/src/framework/Framework.Web/Directory.Build.props index 3f35c3e9a7..a1f63cf18c 100644 --- a/src/framework/Framework.Web/Directory.Build.props +++ b/src/framework/Framework.Web/Directory.Build.props @@ -20,6 +20,6 @@ 1.0.0 - + dummy - + \ No newline at end of file diff --git a/src/framework/Framework.Web/Framework.Web.csproj b/src/framework/Framework.Web/Framework.Web.csproj index ba1ca205ce..42d499da6a 100644 --- a/src/framework/Framework.Web/Framework.Web.csproj +++ b/src/framework/Framework.Web/Framework.Web.csproj @@ -1,5 +1,6 @@ - - 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 - - diff --git a/src/web/Web.Identity/IClaimsIdentityDataBuilder.cs b/src/framework/Framework.Web/IClaimsIdentityDataBuilder.cs similarity index 95% rename from src/web/Web.Identity/IClaimsIdentityDataBuilder.cs rename to src/framework/Framework.Web/IClaimsIdentityDataBuilder.cs index 1585aab059..3f68c55f2c 100644 --- a/src/web/Web.Identity/IClaimsIdentityDataBuilder.cs +++ b/src/framework/Framework.Web/IClaimsIdentityDataBuilder.cs @@ -20,7 +20,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public interface IClaimsIdentityDataBuilder : IIdentityData { diff --git a/src/framework/Framework.Web/MandatoryIdentityClaimHandler.cs b/src/framework/Framework.Web/MandatoryIdentityClaimHandler.cs new file mode 100644 index 0000000000..eb15bd92a7 --- /dev/null +++ b/src/framework/Framework.Web/MandatoryIdentityClaimHandler.cs @@ -0,0 +1,133 @@ +/******************************************************************************** + * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ + +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.Logging; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using System.Security.Claims; + +namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web +{ + public class MandatoryIdentityClaimRequirement : IAuthorizationRequirement + { + public MandatoryIdentityClaimRequirement(PolicyTypeId policyTypeId) + { + PolicyTypeId = policyTypeId; + } + + public PolicyTypeId PolicyTypeId { get; } + } + + public class MandatoryIdentityClaimHandler : AuthorizationHandler + { + private readonly IIdentityRepository _identityRepository; + private readonly IServiceAccountRepository _serviceAccountRepository; + private readonly IClaimsIdentityDataBuilder _identityDataBuilder; + private readonly ILogger _logger; + + public MandatoryIdentityClaimHandler(IClaimsIdentityDataBuilder claimsIdentityDataBuilder, IPortalRepositories portalRepositories, ILogger logger) + { + _identityDataBuilder = claimsIdentityDataBuilder; + _identityRepository = portalRepositories.GetInstance(); + _serviceAccountRepository = portalRepositories.GetInstance(); + _logger = logger; + } + + protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, MandatoryIdentityClaimRequirement requirement) + { + if (_identityDataBuilder.Status == IClaimsIdentityDataBuilderStatus.Initial) + { + await InitializeClaims(context.User).ConfigureAwait(false); + } + if (_identityDataBuilder.Status == IClaimsIdentityDataBuilderStatus.Empty) + { + context.Fail(); + return; + } + if (requirement.PolicyTypeId switch + { + PolicyTypeId.ValidIdentity => _identityDataBuilder.IdentityId != Guid.Empty, + PolicyTypeId.ValidCompany => (await GetCompanyId().ConfigureAwait(false)) != Guid.Empty, + PolicyTypeId.CompanyUser => _identityDataBuilder.IdentityTypeId == IdentityTypeId.COMPANY_USER, + PolicyTypeId.ServiceAccount => _identityDataBuilder.IdentityTypeId == IdentityTypeId.COMPANY_SERVICE_ACCOUNT, + _ => throw new UnexpectedConditionException($"unexpected PolicyTypeId {requirement.PolicyTypeId}") + }) + { + context.Succeed(requirement); + } + else + { + context.Fail(); + } + } + + private async ValueTask InitializeClaims(ClaimsPrincipal principal) + { + var preferredUserName = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.PreferredUserName)?.Value; + if (Guid.TryParse(preferredUserName, out var identityId)) + { + _identityDataBuilder.AddIdentityId(identityId); + _identityDataBuilder.AddIdentityTypeId(IdentityTypeId.COMPANY_USER); + _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Initialized; + return; + } + + (Guid IdentityId, Guid CompanyId) serviceAccountData; + var clientId = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.ClientId)?.Value; + if (!string.IsNullOrWhiteSpace(clientId) && (serviceAccountData = await _serviceAccountRepository.GetServiceAccountDataByClientId(clientId).ConfigureAwait(false)) != default) + { + _identityDataBuilder.AddIdentityId(serviceAccountData.IdentityId); + _identityDataBuilder.AddIdentityTypeId(IdentityTypeId.COMPANY_SERVICE_ACCOUNT); + _identityDataBuilder.AddCompanyId(serviceAccountData.CompanyId); + _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete; + return; + } + + var sub = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.Sub)?.Value; + _logger.LogInformation("Preferred user name {PreferredUserName} couldn't be parsed to uuid for sub {Sub}", preferredUserName, sub); + + (Guid IdentityId, IdentityTypeId IdentityTypeId, Guid CompanyId) identityData; + if (!string.IsNullOrWhiteSpace(sub) && (identityData = await _identityRepository.GetActiveIdentityDataByUserEntityId(sub).ConfigureAwait(false)) != default) + { + _identityDataBuilder.AddIdentityId(identityData.IdentityId); + _identityDataBuilder.AddIdentityTypeId(identityData.IdentityTypeId); + _identityDataBuilder.AddCompanyId(identityData.CompanyId); + _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete; + return; + } + + _logger.LogWarning("No identity found for userEntityId {Sub}", sub); + _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Empty; + } + + private async ValueTask GetCompanyId() + { + if (_identityDataBuilder.Status == IClaimsIdentityDataBuilderStatus.Initialized) + { + _identityDataBuilder.AddCompanyId(await _identityRepository.GetActiveCompanyIdByIdentityId(_identityDataBuilder.IdentityId).ConfigureAwait(false)); + _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete; + } + return _identityDataBuilder.CompanyId; + } + } +} diff --git a/src/framework/Framework.Web/README.md b/src/framework/Framework.Web/README.md deleted file mode 100644 index 45f7ba75b6..0000000000 --- a/src/framework/Framework.Web/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Catena-X Portal Backend Framework Web - -The Catena-X Portal Backend Framework Web library provides a useful set of extensions and functionality to setup a asp net core application. - -This content is produced and maintained by the Eclipse Tractus-X project. - -* Project home: https://projects.eclipse.org/projects/automotive.tractusx - -## Installation - -dotnet add package Org.Eclipse.TractusX.Portal.Backend.Framework.Web - -## Source Code - -The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: - -- https://github.com/eclipse-tractusx/portal-backend - -## License - -Distributed under the Apache 2.0 License. diff --git a/src/framework/Framework.Web/StartupServiceExtensions.cs b/src/framework/Framework.Web/StartupServiceExtensions.cs index 37aea1d0e5..7b159eb9ab 100644 --- a/src/framework/Framework.Web/StartupServiceExtensions.cs +++ b/src/framework/Framework.Web/StartupServiceExtensions.cs @@ -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,13 +17,17 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.Cors; using Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider.DependencyInjection; -using Org.Eclipse.TractusX.Portal.Backend.Framework.DependencyInjection; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.Swagger; +using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication; using System.IdentityModel.Tokens.Jwt; using System.Text.Json.Serialization; @@ -31,14 +35,14 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public static class StartupServiceExtensions { - public static IServiceCollection AddDefaultServices(this IServiceCollection services, IConfigurationRoot configuration, string version, string cookieName) + public static IServiceCollection AddDefaultServices(this IServiceCollection services, IConfigurationRoot configuration, string version) { services.AddCors(options => options.SetupCors(configuration)); services.AddDistributedMemoryCache(); services.AddSession(options => { - options.Cookie.Name = cookieName; + options.Cookie.Name = ".Portal"; options.IdleTimeout = TimeSpan.FromMinutes(10); }); @@ -65,9 +69,18 @@ public static IServiceCollection AddDefaultServices(this IServiceColle }; } }); + services.AddTransient(); + services.AddAuthorization(options => + { + options.AddPolicy(PolicyTypes.ValidIdentity, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.ValidIdentity))); + options.AddPolicy(PolicyTypes.ValidCompany, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.ValidCompany))); + options.AddPolicy(PolicyTypes.CompanyUser, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.CompanyUser))); + options.AddPolicy(PolicyTypes.ServiceAccount, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.ServiceAccount))); + }); + JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear(); - services + services.AddTransient() .AddOptions() .Bind(configuration.GetSection("JwtBearerOptions")) .ValidateOnStart(); @@ -76,9 +89,10 @@ public static IServiceCollection AddDefaultServices(this IServiceColle .AddCheck("JwtBearerConfiguration", tags: new[] { "keycloak" }); services.AddHttpContextAccessor(); + services.AddClaimsIdentityService(); services.AddDateTimeProvider(); - services.AutoRegister(); + services.AddPublicInfos(); return services; } } diff --git a/src/framework/Framework.Web/StartupServiceWebApplicationExtensions.cs b/src/framework/Framework.Web/StartupServiceWebApplicationExtensions.cs index 30558fb412..3492e00b55 100644 --- a/src/framework/Framework.Web/StartupServiceWebApplicationExtensions.cs +++ b/src/framework/Framework.Web/StartupServiceWebApplicationExtensions.cs @@ -20,22 +20,43 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; using Org.Eclipse.TractusX.Portal.Backend.Framework.Cors; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web; +using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory; using Serilog; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web; public static class StartupServiceWebApplicationExtensions { - public static WebApplication CreateApp(this WebApplication app, string apiPath, string version) + public static WebApplication CreateApp(this WebApplication app, string apiPath, string version, IHostEnvironment environment) { app.UseSerilogRequestLogging(); + if (environment.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + var urlsToTrust = app.Configuration.GetSection("Keycloak").Get()?.Values + .Where(config => config.ConnectionString.StartsWith("https://")) + .Select(config => config.ConnectionString) + .Distinct(); + if (urlsToTrust != null) + { + FlurlUntrustedCertExceptionHandler.ConfigureExceptions(urlsToTrust); + } + } + + var assemblyName = typeof(TProgram).Assembly.FullName?.Split(',')[0]; + + FlurlErrorHandler.ConfigureErrorHandler(app.Services.GetRequiredService>(), environment.IsDevelopment()); + if (app.Configuration.GetValue("SwaggerEnabled") != null && app.Configuration.GetValue("SwaggerEnabled")) { - var assemblyName = typeof(TProgram).Assembly.FullName?.Split(',')[0]; app.UseSwagger(c => c.RouteTemplate = $"/api/{apiPath}/swagger/{{documentName}}/swagger.{{json|yaml}}"); app.UseSwaggerUI(c => diff --git a/src/framework/Framework.Web/WebApplicationBuildRunner.cs b/src/framework/Framework.Web/WebApplicationBuildRunner.cs index 21afbc2c90..b35b3e2dde 100644 --- a/src/framework/Framework.Web/WebApplicationBuildRunner.cs +++ b/src/framework/Framework.Web/WebApplicationBuildRunner.cs @@ -21,7 +21,6 @@ using Flurl.Util; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; using Serilog; @@ -33,9 +32,7 @@ public static void BuildAndRunWebApplication( string[] args, string path, string version, - string cookieName, - Action? configureBuilder, - Action? configureApp) + Action configureBuilder) { LoggingExtensions.EnsureInitialized(); Log.Information("Starting the application"); @@ -57,17 +54,15 @@ public static void BuildAndRunWebApplication( } }); builder.Services - .AddDefaultServices(builder.Configuration, version, cookieName); + .AddDefaultServices(builder.Configuration, version); - configureBuilder?.Invoke(builder); + configureBuilder(builder); - var app = builder.Build().CreateApp(path, version); - configureApp?.Invoke(app, builder.Environment); - app.Run(); + builder.Build().CreateApp(path, version, builder.Environment).Run(); } catch (Exception ex) when (!ex.GetType().Name.Equals("StopTheHostException", StringComparison.Ordinal)) { - Log.Fatal(ex, "Start failed due to unhandled exception"); + Log.Fatal("Unhandled exception {Exception}", ex); } finally { diff --git a/src/framework/README.md b/src/framework/README.md deleted file mode 100644 index 2799d3ef9b..0000000000 --- a/src/framework/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# Framework Packages - -All projects within the framework directory are built and provided as NuGet packages. - -Please do not add direct references to any framework project which is not in the framework directory - -## Package Configuration - -Each package's configuration is defined in its .csproj file. You can refer to a package's .csproj file or consult the [Microsoft Documentation](https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#package-metadata) for guidance. - -**Important** - -- Every package should have its own README file with a brief description of what the package includes. -- Include the following files from the root of the project in your package: - - [LICENSE]("../../../LICENSE") - - [NOTICE.md]("../../../NOTICE.md") - - [DEPENDENCIES]("../../../DEPENDENCIES") - - [CONTRIBUTING.md]("../../../CONTRIBUTING.md") - -Exceptions: For package versions, we use the `Directory.Build.props`, which sets the PackageVersion during the build process. To update package versions, please refer to [how to build nuget packages](./../../scripts/update-nuget-packages.md) - -## Linking Framework Packages - -You can link one framework package to another by adding a project reference. Here's an example: - -``` C# - - - -``` - -When linking a NuGet package in this manner, the referencing package will use the current version of the linked package. For example, if the current version of the package `Framework.ErrorHandling.Library` is 1.1.0 and you reference it in `Framework.ErrorHandling.Library.Web` using the example above, `Framework.ErrorHandling.Library.Web` will reference this specific version when building the NuGet package. - -## Build - -Please make sure to update the version as soon as a package was updated with the [update_framework_versions](./../../scripts/update_framework_versions.sh) script. \ No newline at end of file diff --git a/src/keycloak/Keycloak.Authentication/ControllerExtensions.cs b/src/keycloak/Keycloak.Authentication/ControllerExtensions.cs index 65bca096b0..81bcaa79b8 100644 --- a/src/keycloak/Keycloak.Authentication/ControllerExtensions.cs +++ b/src/keycloak/Keycloak.Authentication/ControllerExtensions.cs @@ -19,6 +19,8 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using System.Security.Claims; namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication; diff --git a/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj b/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj index 383da8df48..2d91e75b94 100644 --- a/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj +++ b/src/keycloak/Keycloak.Authentication/Keycloak.Authentication.csproj @@ -1,5 +1,5 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling - Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling - net7.0 - enable - enable - - - - - - - - - - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling + net7.0 + enable + enable + + + + + + + + + + + + diff --git a/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj b/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj index bae2fcf602..b111e32bbd 100644 --- a/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj +++ b/src/keycloak/Keycloak.Factory/Keycloak.Factory.csproj @@ -1,40 +1,40 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory - net7.0 - enable - enable - - - - - - - - - - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory + net7.0 + enable + enable + + + + + + + + + + + + + diff --git a/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs b/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs index 862d81e163..b2d1e6adab 100644 --- a/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs +++ b/src/keycloak/Keycloak.Seeding/BusinessLogic/ClientsUpdater.cs @@ -1,5 +1,6 @@ /******************************************************************************** - * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2021, 2023 BMW Group AG + * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj b/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj index c55b0b596c..c9f60875cf 100644 --- a/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj +++ b/src/keycloak/Keycloak.Seeding/Keycloak.Seeding.csproj @@ -1,71 +1,74 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Keycloak.Seeding - Org.Eclipse.TractusX.Portal.Backend.Keycloak.Seeding - net7.0 - enable - enable - b9d59db4-40b8-4722-8263-a61a1ef3155c - Linux - ..\..\.. - True - CS1591 - Exe - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Keycloak.Seeding + Org.Eclipse.TractusX.Portal.Backend.Keycloak.Seeding + net7.0 + enable + enable + b9d59db4-40b8-4722-8263-a61a1ef3155c + Linux + ..\..\.. + True + CS1591 + Exe + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + diff --git a/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj b/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj index a050c1eb9e..d4a0eade79 100644 --- a/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj +++ b/src/mailing/Mailing.SendMail/Mailing.SendMail.csproj @@ -33,7 +33,6 @@ - diff --git a/src/mailing/Mailing.Service/Mailing.Service.csproj b/src/mailing/Mailing.Service/Mailing.Service.csproj index 5f3521ce8f..5888853152 100644 --- a/src/mailing/Mailing.Service/Mailing.Service.csproj +++ b/src/mailing/Mailing.Service/Mailing.Service.csproj @@ -29,6 +29,7 @@ + \ No newline at end of file diff --git a/src/mailing/Mailing.Template/Mailing.Template.csproj b/src/mailing/Mailing.Template/Mailing.Template.csproj index a027cc4a42..1fff5d3c3c 100644 --- a/src/mailing/Mailing.Template/Mailing.Template.csproj +++ b/src/mailing/Mailing.Template/Mailing.Template.csproj @@ -1,50 +1,52 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Mailing.Template - net7.0 - enable - enable - - - - - - - - - - - - - - - EmailTemplates/**/* - - - - - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Mailing.Template + net7.0 + enable + enable + + + + + + + + + + + + + + + + + + + + + EmailTemplates/**/* + + + + diff --git a/src/maintenance/Maintenance.App/Maintenance.App.csproj b/src/maintenance/Maintenance.App/Maintenance.App.csproj index 7a5b77c1be..a537e09369 100644 --- a/src/maintenance/Maintenance.App/Maintenance.App.csproj +++ b/src/maintenance/Maintenance.App/Maintenance.App.csproj @@ -1,74 +1,74 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Maintenance.App - Org.Eclipse.TractusX.Portal.Backend.Maintenance.App - net7.0 - enable - enable - 032003D5-FBCF-48CE-AE7C-F8F5F43DCCC1 - Linux - ..\..\.. - True - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - Program.cs - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Maintenance.App + Org.Eclipse.TractusX.Portal.Backend.Maintenance.App + net7.0 + enable + enable + 032003D5-FBCF-48CE-AE7C-F8F5F43DCCC1 + Linux + ..\..\.. + True + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + Program.cs + + + + diff --git a/src/maintenance/Maintenance.App/Program.cs b/src/maintenance/Maintenance.App/Program.cs index 48ca9385b4..80c85aca48 100644 --- a/src/maintenance/Maintenance.App/Program.cs +++ b/src/maintenance/Maintenance.App/Program.cs @@ -21,10 +21,10 @@ using Laraue.EfCoreTriggers.PostgreSql.Extensions; using Microsoft.EntityFrameworkCore; using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Maintenance.App; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Auditing; -using Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.DependencyInjection; using Serilog; LoggingExtensions.EnsureInitialized(); diff --git a/src/marketplace/Apps.Service/Apps.Service.csproj b/src/marketplace/Apps.Service/Apps.Service.csproj index c120f46c8c..4687bc0571 100644 --- a/src/marketplace/Apps.Service/Apps.Service.csproj +++ b/src/marketplace/Apps.Service/Apps.Service.csproj @@ -20,7 +20,6 @@ Org.Eclipse.TractusX.Portal.Backend.Apps.Service - Org.Eclipse.TractusX.Portal.Backend.Apps.Service net7.0 enable enable @@ -37,16 +36,14 @@ - + - - - + diff --git a/src/marketplace/Apps.Service/Controllers/AppChangeController.cs b/src/marketplace/Apps.Service/Controllers/AppChangeController.cs index 34d6d0cbe3..ff208ae2b8 100644 --- a/src/marketplace/Apps.Service/Controllers/AppChangeController.cs +++ b/src/marketplace/Apps.Service/Controllers/AppChangeController.cs @@ -22,10 +22,10 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.Controllers; diff --git a/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs b/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs index cdfcf899b2..4ba2962955 100644 --- a/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs +++ b/src/marketplace/Apps.Service/Controllers/AppReleaseProcessController.cs @@ -22,12 +22,11 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.Controllers; diff --git a/src/marketplace/Apps.Service/Controllers/AppsController.cs b/src/marketplace/Apps.Service/Controllers/AppsController.cs index ce072056b1..b710f0f5e4 100644 --- a/src/marketplace/Apps.Service/Controllers/AppsController.cs +++ b/src/marketplace/Apps.Service/Controllers/AppsController.cs @@ -22,13 +22,12 @@ using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.ViewModels; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Apps.Service.Controllers; diff --git a/src/marketplace/Apps.Service/Program.cs b/src/marketplace/Apps.Service/Program.cs index c188e7ae32..c19512de6a 100644 --- a/src/marketplace/Apps.Service/Program.cs +++ b/src/marketplace/Apps.Service/Program.cs @@ -19,6 +19,7 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.Apps.Service.BusinessLogic; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Web; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.Notifications.Library; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.DependencyInjection; @@ -27,17 +28,12 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; -using Org.Eclipse.TractusX.Portal.Backend.Web.Initialization; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; var VERSION = "v2"; -WebAppHelper +WebApplicationBuildRunner .BuildAndRunWebApplication(args, "apps", VERSION, builder => { - builder.Services - .AddPublicInfos(); - builder.Services .AddMailingAndTemplateManager(builder.Configuration) .AddPortalRepositories(builder.Configuration) diff --git a/src/marketplace/Offers.Library.Web/OfferDocumentService.cs b/src/marketplace/Offers.Library.Web/OfferDocumentService.cs index cd72a13516..918c5596d2 100644 --- a/src/marketplace/Offers.Library.Web/OfferDocumentService.cs +++ b/src/marketplace/Offers.Library.Web/OfferDocumentService.cs @@ -94,9 +94,9 @@ public async Task UploadDocumentAsync(Guid id, DocumentTypeId documentTypeId, IF throw new ForbiddenException($"Company {_identityData.CompanyId} is not the provider company of {offerTypeId} {id}"); } - var documentData = await document.GetContentAndHash(cancellationToken).ConfigureAwait(false); + var (content, hash) = await document.GetContentAndHash(cancellationToken).ConfigureAwait(false); - var doc = _portalRepositories.GetInstance().CreateDocument(document.FileName, documentData.Content, documentData.Hash, mediaTypeId, documentTypeId, x => + var doc = _portalRepositories.GetInstance().CreateDocument(document.FileName, content, hash, mediaTypeId, documentTypeId, x => { x.CompanyUserId = _identityData.IdentityId; }); diff --git a/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj b/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj index e61787b479..abc6686621 100644 --- a/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj +++ b/src/marketplace/Offers.Library.Web/Offers.Library.Web.csproj @@ -1,42 +1,37 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Web - Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Web - net7.0 - enable - enable - - - - - - - - - - - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Web + net7.0 + enable + enable + + + + + + + + + + diff --git a/src/marketplace/Offers.Library/DependencyInjection/OfferSetupServiceExtensions.cs b/src/marketplace/Offers.Library/DependencyInjection/OfferSetupServiceExtensions.cs index d2a7b1b7d0..d605fa3597 100644 --- a/src/marketplace/Offers.Library/DependencyInjection/OfferSetupServiceExtensions.cs +++ b/src/marketplace/Offers.Library/DependencyInjection/OfferSetupServiceExtensions.cs @@ -19,7 +19,8 @@ ********************************************************************************/ using Microsoft.Extensions.DependencyInjection; -using Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClientExtensions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; +using Org.Eclipse.TractusX.Portal.Backend.Mailing.Service; using Org.Eclipse.TractusX.Portal.Backend.Mailing.Service.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Service; using Org.Eclipse.TractusX.Portal.Backend.Processes.OfferSubscription.Library.DependencyInjection; diff --git a/src/marketplace/Offers.Library/Offers.Library.csproj b/src/marketplace/Offers.Library/Offers.Library.csproj index f53abba71a..ee6a01ad8b 100644 --- a/src/marketplace/Offers.Library/Offers.Library.csproj +++ b/src/marketplace/Offers.Library/Offers.Library.csproj @@ -1,47 +1,42 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Offers.Library - Org.Eclipse.TractusX.Portal.Backend.Offers.Library - net7.0 - enable - enable - - - - - - - - - - - - - - - - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Offers.Library + net7.0 + enable + enable + + + + + + + + + + + + + + + diff --git a/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs b/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs index ed0052d7f1..c1cd6badb2 100644 --- a/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs +++ b/src/marketplace/Services.Service/Controllers/ServiceChangeController.cs @@ -20,9 +20,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.Controllers; diff --git a/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs b/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs index 200e2f84b9..22b01dadb5 100644 --- a/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs +++ b/src/marketplace/Services.Service/Controllers/ServiceReleaseController.cs @@ -20,14 +20,13 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.ViewModels; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.Controllers; diff --git a/src/marketplace/Services.Service/Controllers/ServicesController.cs b/src/marketplace/Services.Service/Controllers/ServicesController.cs index 8fdd47de31..372337d55c 100644 --- a/src/marketplace/Services.Service/Controllers/ServicesController.cs +++ b/src/marketplace/Services.Service/Controllers/ServicesController.cs @@ -1,5 +1,6 @@ /******************************************************************************** - * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2021, 2023 BMW Group AG + * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -19,15 +20,14 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.ViewModels; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; namespace Org.Eclipse.TractusX.Portal.Backend.Services.Service.Controllers; diff --git a/src/marketplace/Services.Service/Program.cs b/src/marketplace/Services.Service/Program.cs index d3eef783e3..fc11e2d56c 100644 --- a/src/marketplace/Services.Service/Program.cs +++ b/src/marketplace/Services.Service/Program.cs @@ -18,6 +18,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Org.Eclipse.TractusX.Portal.Backend.Framework.Web; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.Notifications.Library; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.DependencyInjection; @@ -27,17 +28,12 @@ using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Services.Service.DependencyInjection; -using Org.Eclipse.TractusX.Portal.Backend.Web.Initialization; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; var VERSION = "v2"; -WebAppHelper +WebApplicationBuildRunner .BuildAndRunWebApplication(args, "services", VERSION, builder => { - builder.Services - .AddPublicInfos(); - builder.Services .AddMailingAndTemplateManager(builder.Configuration) .AddPortalRepositories(builder.Configuration) diff --git a/src/marketplace/Services.Service/Services.Service.csproj b/src/marketplace/Services.Service/Services.Service.csproj index c99434c91d..da5ca428fb 100644 --- a/src/marketplace/Services.Service/Services.Service.csproj +++ b/src/marketplace/Services.Service/Services.Service.csproj @@ -22,7 +22,6 @@ Org.Eclipse.TractusX.Portal.Backend.Services.Service - Org.Eclipse.TractusX.Portal.Backend.Services.Service net7.0 enable enable @@ -34,13 +33,12 @@ - + + - - - + diff --git a/src/notifications/Notifications.Service/Controllers/NotificationController.cs b/src/notifications/Notifications.Service/Controllers/NotificationController.cs index 52078db957..325c883854 100644 --- a/src/notifications/Notifications.Service/Controllers/NotificationController.cs +++ b/src/notifications/Notifications.Service/Controllers/NotificationController.cs @@ -20,13 +20,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.Controllers; diff --git a/src/notifications/Notifications.Service/Notifications.Service.csproj b/src/notifications/Notifications.Service/Notifications.Service.csproj index 85e24888e2..ec38e18f75 100644 --- a/src/notifications/Notifications.Service/Notifications.Service.csproj +++ b/src/notifications/Notifications.Service/Notifications.Service.csproj @@ -33,13 +33,12 @@ - - - + + + + - - - + diff --git a/src/notifications/Notifications.Service/Program.cs b/src/notifications/Notifications.Service/Program.cs index 530296ca27..6a1cb785f6 100644 --- a/src/notifications/Notifications.Service/Program.cs +++ b/src/notifications/Notifications.Service/Program.cs @@ -18,19 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +using Org.Eclipse.TractusX.Portal.Backend.Framework.Web; using Org.Eclipse.TractusX.Portal.Backend.Notifications.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; -using Org.Eclipse.TractusX.Portal.Backend.Web.Initialization; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; var VERSION = "v2"; -WebAppHelper +WebApplicationBuildRunner .BuildAndRunWebApplication(args, "notification", VERSION, builder => { - builder.Services - .AddPublicInfos(); - builder.Services .AddPortalRepositories(builder.Configuration); diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/DocumentSeedData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/DocumentSeedData.cs index bdffe6ff84..d163b1959f 100644 --- a/src/portalbackend/PortalBackend.DBAccess/Models/DocumentSeedData.cs +++ b/src/portalbackend/PortalBackend.DBAccess/Models/DocumentSeedData.cs @@ -25,7 +25,7 @@ namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; public record DocumentSeedData( [property: JsonPropertyName("id")] Guid Id, - [property: JsonPropertyName("date_created"), JsonConverter(typeof(JsonDateTimeOffsetConverter))] DateTimeOffset DateCreated, + [property: JsonPropertyName("date_created"), Newtonsoft.Json.JsonConverter(typeof(JsonDateTimeOffsetConverter))] DateTimeOffset DateCreated, [property: JsonPropertyName("document_name")] string DocumentName, [property: JsonPropertyName("document_type_id")] int DocumentTypeId, [property: JsonPropertyName("company_user_id")] Guid? CompanyUserId, diff --git a/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj b/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj index 598e4dea3d..dae64839c8 100644 --- a/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj +++ b/src/portalbackend/PortalBackend.DBAccess/PortalBackend.DBAccess.csproj @@ -1,45 +1,46 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess - Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess - net7.0 - enable - enable - - - - - - - - - - - - - - - - - - + + + + + Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess + Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess + net7.0 + enable + enable + + + + + + + + + + + + + + + + + + + diff --git a/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj b/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj index c0096843dc..446692f633 100644 --- a/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj +++ b/src/portalbackend/PortalBackend.Migrations/PortalBackend.Migrations.csproj @@ -40,14 +40,15 @@ + - + - + diff --git a/src/portalbackend/PortalBackend.Migrations/Program.cs b/src/portalbackend/PortalBackend.Migrations/Program.cs index 245fbc9956..f5ee9516ba 100644 --- a/src/portalbackend/PortalBackend.Migrations/Program.cs +++ b/src/portalbackend/PortalBackend.Migrations/Program.cs @@ -25,10 +25,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.Seeding.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Auditing; -using Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.DependencyInjection; using Serilog; using System.Reflection; diff --git a/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj b/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj index 3ab5df938e..bef196a85d 100644 --- a/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj +++ b/src/portalbackend/PortalBackend.PortalEntities/PortalBackend.PortalEntities.csproj @@ -1,51 +1,51 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities - Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities - net7.0 - enable - enable - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - **/PortalDbContext.cs - **/AuditEntities/*.cs - - - - - - - - - - + + + + + Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities + Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities + net7.0 + enable + enable + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + **/PortalDbContext.cs + **/AuditEntities/*.cs + + + + + + + + + + diff --git a/src/processes/ApplicationChecklist.Config/ApplicationChecklist.Config.csproj b/src/processes/ApplicationChecklist.Config/ApplicationChecklist.Config.csproj index 78a92cc995..b6713a2ae1 100644 --- a/src/processes/ApplicationChecklist.Config/ApplicationChecklist.Config.csproj +++ b/src/processes/ApplicationChecklist.Config/ApplicationChecklist.Config.csproj @@ -36,6 +36,7 @@ + diff --git a/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj b/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj index 9c3169e164..9babed5eed 100644 --- a/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj +++ b/src/processes/NetworkRegistration.Library/NetworkRegistration.Library.csproj @@ -28,10 +28,6 @@ enable - - - - diff --git a/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs b/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs index 2b6790985f..9e9c8b1771 100644 --- a/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs +++ b/src/processes/Processes.Worker.Library/IProcessTypeExecutor.cs @@ -18,7 +18,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; namespace Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library; diff --git a/src/processes/Processes.Worker.Library/ProcessExecutionService.cs b/src/processes/Processes.Worker.Library/ProcessExecutionService.cs index ef54029bf6..fe49b031af 100644 --- a/src/processes/Processes.Worker.Library/ProcessExecutionService.cs +++ b/src/processes/Processes.Worker.Library/ProcessExecutionService.cs @@ -24,9 +24,9 @@ using Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider; using Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; -using Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; namespace Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library; diff --git a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj index c534be1c7a..2081e7fd1d 100644 --- a/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj +++ b/src/processes/Processes.Worker.Library/Processes.Worker.Library.csproj @@ -1,40 +1,39 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library - Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library - net7.0 - enable - enable - - - - - - - - - - - - - + + + + + + + + + + + + + + Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library + Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library + net7.0 + enable + enable + + + diff --git a/src/processes/Processes.Worker/Processes.Worker.csproj b/src/processes/Processes.Worker/Processes.Worker.csproj index 994d5d89de..c50d9b584c 100644 --- a/src/processes/Processes.Worker/Processes.Worker.csproj +++ b/src/processes/Processes.Worker/Processes.Worker.csproj @@ -1,79 +1,80 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Processes.Worker - Org.Eclipse.TractusX.Portal.Backend.Processes.Worker - net7.0 - enable - enable - 864FF3A5-6A8A-4786-939B-D7060E74EEF6 - Exe - Linux - ..\..\.. - True - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - Program.cs - - - - - - - Always - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Processes.Worker + Org.Eclipse.TractusX.Portal.Backend.Processes.Worker + net7.0 + enable + enable + 864FF3A5-6A8A-4786-939B-D7060E74EEF6 + Exe + Linux + ..\..\.. + True + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + Program.cs + + + + + + + Always + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + diff --git a/src/processes/Processes.Worker/Program.cs b/src/processes/Processes.Worker/Program.cs index c08343094f..512df1c869 100644 --- a/src/processes/Processes.Worker/Program.cs +++ b/src/processes/Processes.Worker/Program.cs @@ -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. @@ -22,6 +22,7 @@ using Microsoft.Extensions.Hosting; using Org.Eclipse.TractusX.Portal.Backend.ApplicationActivation.Library.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.Logging; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory; using Org.Eclipse.TractusX.Portal.Backend.Offers.Library.DependencyInjection; @@ -30,7 +31,6 @@ using Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Executor; using Org.Eclipse.TractusX.Portal.Backend.Processes.NetworkRegistration.Executor.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Processes.OfferSubscription.Executor.DependencyInjection; -using Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library; using Serilog; diff --git a/src/provisioning/Provisioning.Library/ErrorHandling/ProvisioningServiceErrorMessageContainer.cs b/src/provisioning/Provisioning.Library/ErrorHandling/ProvisioningServiceErrorMessageContainer.cs index 135a14e4bd..aeee340dc7 100644 --- a/src/provisioning/Provisioning.Library/ErrorHandling/ProvisioningServiceErrorMessageContainer.cs +++ b/src/provisioning/Provisioning.Library/ErrorHandling/ProvisioningServiceErrorMessageContainer.cs @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using System.Collections.Immutable; namespace Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.ErrorHandling; diff --git a/src/provisioning/Provisioning.Library/Provisioning.Library.csproj b/src/provisioning/Provisioning.Library/Provisioning.Library.csproj index ae32fdf411..3910d284bd 100644 --- a/src/provisioning/Provisioning.Library/Provisioning.Library.csproj +++ b/src/provisioning/Provisioning.Library/Provisioning.Library.csproj @@ -1,47 +1,48 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library - Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library - net7.0 - enable - enable - - - - - - - - - - - - - - - - - - - + + + + + + Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library + Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library + net7.0 + enable + enable + + + + + + + + + + + + + + + + + + + + diff --git a/src/provisioning/Provisioning.Migrations/Migrations/ProvisioningDbContextModelSnapshot.cs b/src/provisioning/Provisioning.Migrations/Migrations/ProvisioningDbContextModelSnapshot.cs index 489a0f36d5..deb3dabb3f 100644 --- a/src/provisioning/Provisioning.Migrations/Migrations/ProvisioningDbContextModelSnapshot.cs +++ b/src/provisioning/Provisioning.Migrations/Migrations/ProvisioningDbContextModelSnapshot.cs @@ -25,7 +25,7 @@ #nullable disable -namespace Org.Eclipse.TractusX.Portal.Backend.Provisioning.Migrations.Migrations +namespace Org.Eclipse.TractusX.Provisioning.Migrations.Migrations { [DbContext(typeof(ProvisioningDbContext))] partial class ProvisioningDbContextModelSnapshot : ModelSnapshot diff --git a/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj b/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj index 1cd43fd70c..4989c57cb0 100644 --- a/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj +++ b/src/provisioning/Provisioning.Migrations/Provisioning.Migrations.csproj @@ -1,80 +1,82 @@ - - - - - - Org.Eclipse.TractusX.Portal.Backend.Provisioning.Migrations - Org.Eclipse.TractusX.Portal.Backend.Provisioning.Migrations - net7.0 - enable - enable - 8ff18631-81b3-4630-882b-0a6ef5ff9fc3 - Linux - ..\..\.. - True - Exe - - true - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - + + + + + + Org.CatenaX.Ng.Portal.Backend.Provisioning.Migrations + Org.CatenaX.Ng.Portal.Backend.Provisioning.Migrations + net7.0 + enable + enable + 8ff18631-81b3-4630-882b-0a6ef5ff9fc3 + Linux + ..\..\.. + True + Exe + + true + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + diff --git a/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj b/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj index 685819bbb2..3a523e9d69 100644 --- a/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj +++ b/src/registration/ApplicationActivation.Library/ApplicationActivation.Library.csproj @@ -36,6 +36,7 @@ + diff --git a/src/registration/Registration.Common/Registration.Common.csproj b/src/registration/Registration.Common/Registration.Common.csproj index 2e16447acf..2098557485 100644 --- a/src/registration/Registration.Common/Registration.Common.csproj +++ b/src/registration/Registration.Common/Registration.Common.csproj @@ -1,34 +1,33 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Registration.Common - Org.Eclipse.TractusX.Portal.Backend.Registration.Common - net7.0 - enable - enable - - - - - - - - + + + + + Org.Eclipse.TractusX.Portal.Backend.Registration.Common + Org.Eclipse.TractusX.Portal.Backend.Registration.Common + net7.0 + enable + enable + + + + + + + diff --git a/src/registration/Registration.Service/BusinessLogic/IStaticDataBusinessLogic.cs b/src/registration/Registration.Service/BusinessLogic/IStaticDataBusinessLogic.cs index e5be51d828..f076910434 100644 --- a/src/registration/Registration.Service/BusinessLogic/IStaticDataBusinessLogic.cs +++ b/src/registration/Registration.Service/BusinessLogic/IStaticDataBusinessLogic.cs @@ -18,6 +18,8 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities; +using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Model; namespace Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic; diff --git a/src/registration/Registration.Service/Controllers/NetworkController.cs b/src/registration/Registration.Service/Controllers/NetworkController.cs index 1cd3df32bc..832cf81c75 100644 --- a/src/registration/Registration.Service/Controllers/NetworkController.cs +++ b/src/registration/Registration.Service/Controllers/NetworkController.cs @@ -20,10 +20,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Model; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; namespace Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Controllers; diff --git a/src/registration/Registration.Service/Controllers/RegistrationController.cs b/src/registration/Registration.Service/Controllers/RegistrationController.cs index b94c892071..67fbe0d83e 100644 --- a/src/registration/Registration.Service/Controllers/RegistrationController.cs +++ b/src/registration/Registration.Service/Controllers/RegistrationController.cs @@ -21,14 +21,14 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.Models; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Model; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.Registration.Service.Controllers diff --git a/src/registration/Registration.Service/Program.cs b/src/registration/Registration.Service/Program.cs index a2f88ffe03..577cc3d67b 100644 --- a/src/registration/Registration.Service/Program.cs +++ b/src/registration/Registration.Service/Program.cs @@ -20,23 +20,19 @@ using Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Web; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.Processes.ApplicationChecklist.Config.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Service; using Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic; -using Org.Eclipse.TractusX.Portal.Backend.Web.Initialization; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; var VERSION = "v2"; -WebAppHelper +WebApplicationBuildRunner .BuildAndRunWebApplication(args, "registration", VERSION, builder => { - builder.Services - .AddPublicInfos(); - builder.Services .AddMailingAndTemplateManager(builder.Configuration) .AddPortalRepositories(builder.Configuration) diff --git a/src/registration/Registration.Service/Registration.Service.csproj b/src/registration/Registration.Service/Registration.Service.csproj index 287b395554..6e6007e441 100644 --- a/src/registration/Registration.Service/Registration.Service.csproj +++ b/src/registration/Registration.Service/Registration.Service.csproj @@ -44,16 +44,14 @@ - + + - - - diff --git a/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs b/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs deleted file mode 100644 index f2347bd41e..0000000000 --- a/src/web/Web.Identity/MandatoryIdentityClaimHandler.cs +++ /dev/null @@ -1,131 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -using Microsoft.AspNetCore.Authorization; -using Microsoft.Extensions.Logging; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; -using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; -using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using System.Security.Claims; - -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Identity; - -public class MandatoryIdentityClaimRequirement : IAuthorizationRequirement -{ - public MandatoryIdentityClaimRequirement(PolicyTypeId policyTypeId) - { - PolicyTypeId = policyTypeId; - } - - public PolicyTypeId PolicyTypeId { get; } -} - -public class MandatoryIdentityClaimHandler : AuthorizationHandler -{ - private readonly IIdentityRepository _identityRepository; - private readonly IServiceAccountRepository _serviceAccountRepository; - private readonly IClaimsIdentityDataBuilder _identityDataBuilder; - private readonly ILogger _logger; - - public MandatoryIdentityClaimHandler(IClaimsIdentityDataBuilder claimsIdentityDataBuilder, IPortalRepositories portalRepositories, ILogger logger) - { - _identityDataBuilder = claimsIdentityDataBuilder; - _identityRepository = portalRepositories.GetInstance(); - _serviceAccountRepository = portalRepositories.GetInstance(); - _logger = logger; - } - - protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, MandatoryIdentityClaimRequirement requirement) - { - if (_identityDataBuilder.Status == IClaimsIdentityDataBuilderStatus.Initial) - { - await InitializeClaims(context.User).ConfigureAwait(false); - } - if (_identityDataBuilder.Status == IClaimsIdentityDataBuilderStatus.Empty) - { - context.Fail(); - return; - } - if (requirement.PolicyTypeId switch - { - PolicyTypeId.ValidIdentity => _identityDataBuilder.IdentityId != Guid.Empty, - PolicyTypeId.ValidCompany => (await GetCompanyId().ConfigureAwait(false)) != Guid.Empty, - PolicyTypeId.CompanyUser => _identityDataBuilder.IdentityTypeId == IdentityTypeId.COMPANY_USER, - PolicyTypeId.ServiceAccount => _identityDataBuilder.IdentityTypeId == IdentityTypeId.COMPANY_SERVICE_ACCOUNT, - _ => throw new UnexpectedConditionException($"unexpected PolicyTypeId {requirement.PolicyTypeId}") - }) - { - context.Succeed(requirement); - } - else - { - context.Fail(); - } - } - - private async ValueTask InitializeClaims(ClaimsPrincipal principal) - { - var preferredUserName = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.PreferredUserName)?.Value; - if (Guid.TryParse(preferredUserName, out var identityId)) - { - _identityDataBuilder.AddIdentityId(identityId); - _identityDataBuilder.AddIdentityTypeId(IdentityTypeId.COMPANY_USER); - _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Initialized; - return; - } - - (Guid IdentityId, Guid CompanyId) serviceAccountData; - var clientId = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.ClientId)?.Value; - if (!string.IsNullOrWhiteSpace(clientId) && (serviceAccountData = await _serviceAccountRepository.GetServiceAccountDataByClientId(clientId).ConfigureAwait(false)) != default) - { - _identityDataBuilder.AddIdentityId(serviceAccountData.IdentityId); - _identityDataBuilder.AddIdentityTypeId(IdentityTypeId.COMPANY_SERVICE_ACCOUNT); - _identityDataBuilder.AddCompanyId(serviceAccountData.CompanyId); - _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete; - return; - } - - var sub = principal.Claims.SingleOrDefault(x => x.Type == PortalClaimTypes.Sub)?.Value; - _logger.LogInformation("Preferred user name {PreferredUserName} couldn't be parsed to uuid for sub {Sub}", preferredUserName, sub); - - (Guid IdentityId, IdentityTypeId IdentityTypeId, Guid CompanyId) identityData; - if (!string.IsNullOrWhiteSpace(sub) && (identityData = await _identityRepository.GetActiveIdentityDataByUserEntityId(sub).ConfigureAwait(false)) != default) - { - _identityDataBuilder.AddIdentityId(identityData.IdentityId); - _identityDataBuilder.AddIdentityTypeId(identityData.IdentityTypeId); - _identityDataBuilder.AddCompanyId(identityData.CompanyId); - _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete; - return; - } - - _logger.LogWarning("No identity found for userEntityId {Sub}", sub); - _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Empty; - } - - private async ValueTask GetCompanyId() - { - if (_identityDataBuilder.Status == IClaimsIdentityDataBuilderStatus.Initialized) - { - _identityDataBuilder.AddCompanyId(await _identityRepository.GetActiveCompanyIdByIdentityId(_identityDataBuilder.IdentityId).ConfigureAwait(false)); - _identityDataBuilder.Status = IClaimsIdentityDataBuilderStatus.Complete; - } - return _identityDataBuilder.CompanyId; - } -} diff --git a/src/web/Web.Initialization/WebAppHelper.cs b/src/web/Web.Initialization/WebAppHelper.cs deleted file mode 100644 index 736b9ef5bd..0000000000 --- a/src/web/Web.Initialization/WebAppHelper.cs +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Web; -using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication; -using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Keycloak.Factory; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.DependencyInjection; - -namespace Org.Eclipse.TractusX.Portal.Backend.Web.Initialization; - -public static class WebAppHelper -{ - public static void BuildAndRunWebApplication(string[] args, string path, string version, Action configureBuilder) => - WebApplicationBuildRunner - .BuildAndRunWebApplication(args, path, version, ".Portal", - builder => - { - configureBuilder.Invoke(builder); - builder.Services.AddTransient(); - builder.Services.AddTransient(); - builder.Services.AddAuthorization(options => - { - options.AddPolicy(PolicyTypes.ValidIdentity, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.ValidIdentity))); - options.AddPolicy(PolicyTypes.ValidCompany, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.ValidCompany))); - options.AddPolicy(PolicyTypes.CompanyUser, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.CompanyUser))); - options.AddPolicy(PolicyTypes.ServiceAccount, policy => policy.Requirements.Add(new MandatoryIdentityClaimRequirement(PolicyTypeId.ServiceAccount))); - }); - builder.Services.AddClaimsIdentityService(); - builder.Services.AddPublicInfos(); - }, - (app, environment) => - { - if (environment.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - var urlsToTrust = app.Configuration.GetSection("Keycloak").Get()?.Values - .Where(config => config.ConnectionString.StartsWith("https://")) - .Select(config => config.ConnectionString) - .Distinct(); - if (urlsToTrust != null) - { - FlurlUntrustedCertExceptionHandler.ConfigureExceptions(urlsToTrust); - } - } - - FlurlErrorHandler.ConfigureErrorHandler(app.Services.GetRequiredService>(), environment.IsDevelopment()); - }); -} diff --git a/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj b/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj index cd4c09674a..88c6fc6dfd 100644 --- a/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj +++ b/tests/administration/Administration.Service.Tests/Administration.Service.Tests.csproj @@ -20,11 +20,11 @@ Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests - Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests net7.0 enable enable false + Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests @@ -45,7 +45,7 @@ - + diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs index a66aa02e2c..defe708a72 100644 --- a/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs +++ b/tests/administration/Administration.Service.Tests/BusinessLogic/IdentityProviderBusinessLogicTests.cs @@ -23,7 +23,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.IO; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration; using Org.Eclipse.TractusX.Portal.Backend.Keycloak.ErrorHandling; diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs index d89b681bf1..9391a644da 100644 --- a/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs +++ b/tests/administration/Administration.Service.Tests/BusinessLogic/RegistrationStatusBusinessLogicTest.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.BusinessLogic; diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs index d6f76690e1..719b80bf0c 100644 --- a/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs +++ b/tests/administration/Administration.Service.Tests/BusinessLogic/UserBusinessLogicTests.cs @@ -24,7 +24,6 @@ using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Configuration; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; @@ -35,6 +34,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Service; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.BusinessLogic; diff --git a/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs b/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs index 79037597a6..2d7c1c88e4 100644 --- a/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs +++ b/tests/administration/Administration.Service.Tests/BusinessLogic/UserUploadBusinessLogicTests.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; using Org.Eclipse.TractusX.Portal.Backend.Framework.IO; using Org.Eclipse.TractusX.Portal.Backend.Mailing.SendMail; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; @@ -30,6 +30,7 @@ using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.ErrorHandling; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Service; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Text; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.BusinessLogic.Tests; diff --git a/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs b/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs index 5073c2c946..06c4dba48b 100644 --- a/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs +++ b/tests/administration/Administration.Service.Tests/Controllers/DocumentsControllerTests.cs @@ -23,6 +23,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using System.Text; diff --git a/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs b/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs index 8b48502051..7ea62b2636 100644 --- a/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs +++ b/tests/administration/Administration.Service.Tests/Controllers/RegistrationControllerTest.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; using Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using System.Text; diff --git a/tests/administration/Administration.Service.Tests/Controllers/ServiceAccountControllerTests.cs b/tests/administration/Administration.Service.Tests/Controllers/ServiceAccountControllerTests.cs index 1ede02c061..d344382713 100644 --- a/tests/administration/Administration.Service.Tests/Controllers/ServiceAccountControllerTests.cs +++ b/tests/administration/Administration.Service.Tests/Controllers/ServiceAccountControllerTests.cs @@ -27,6 +27,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; using Org.Eclipse.TractusX.Portal.Backend.Provisioning.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.Controllers; diff --git a/tests/administration/Administration.Service.Tests/Controllers/SubscriptionConfigurationControllerTests.cs b/tests/administration/Administration.Service.Tests/Controllers/SubscriptionConfigurationControllerTests.cs index aef7504f7d..cdf183a32c 100644 --- a/tests/administration/Administration.Service.Tests/Controllers/SubscriptionConfigurationControllerTests.cs +++ b/tests/administration/Administration.Service.Tests/Controllers/SubscriptionConfigurationControllerTests.cs @@ -24,6 +24,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.Controllers; diff --git a/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs b/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs index 6e285ce71c..f2d1501705 100644 --- a/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs +++ b/tests/administration/Administration.Service.Tests/Controllers/UserControllerTest.cs @@ -24,6 +24,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Tests.Controllers; diff --git a/tests/endtoend/EndToEnd.Tests.csproj b/tests/endtoend/EndToEnd.Tests.csproj index 600d7c615a..b0c7dc575f 100644 --- a/tests/endtoend/EndToEnd.Tests.csproj +++ b/tests/endtoend/EndToEnd.Tests.csproj @@ -36,7 +36,7 @@ - + diff --git a/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs b/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs index 6818a267a7..77a079866f 100644 --- a/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs +++ b/tests/endtoend/InterfacePartnerHealthCheck/WalletEndPointTests.cs @@ -18,6 +18,7 @@ ********************************************************************************/ using Castle.Core.Internal; +using Microsoft.Extensions.DependencyInjection; using RestAssured.Response.Logging; using Xunit; using Xunit.Abstractions; diff --git a/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs b/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs index 28aa0c0aae..722b3d1cf7 100644 --- a/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs +++ b/tests/externalsystems/Bpdm.Library/BpdmServiceTests.cs @@ -21,8 +21,8 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library.Tests; @@ -51,7 +51,7 @@ public BpdmServiceTests() ClientId = "CatenaX", ClientSecret = "pass@Secret", GrantType = "cred", - TokenAddress = "https://key.cloak.com", + KeycloakTokenAddress = "https://key.cloak.com", }); _tokenService = A.Fake(); } diff --git a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs index 36c5a7eceb..abf57226de 100644 --- a/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs +++ b/tests/externalsystems/Clearinghouse.Library.Tests/ClearinghouseServiceTests.cs @@ -21,8 +21,8 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.Tests; @@ -52,7 +52,7 @@ public ClearinghouseServiceTests() ClientId = "CatenaX", ClientSecret = "pass@Secret", GrantType = "cred", - TokenAddress = "https://key.cloak.com" + KeycloakTokenAddress = "https://key.cloak.com" }); _tokenService = A.Fake(); _sut = new ClearinghouseService(_tokenService, _options); diff --git a/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs b/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs index 409e27150c..1239352cfc 100644 --- a/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs +++ b/tests/externalsystems/Custodian.Library.Tests/CustodianServiceTests.cs @@ -22,10 +22,10 @@ using Org.Eclipse.TractusX.Portal.Backend.Custodian.Library.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using System.Net; using System.Net.Http.Json; @@ -61,7 +61,7 @@ public CustodianServiceTests() ClientId = "CatenaX", ClientSecret = "pass@Secret", GrantType = "cred", - TokenAddress = "https://key.cloak.com" + KeycloakTokenAddress = "https://key.cloak.com" }); _tokenService = A.Fake(); _dateTimeProvider = A.Fake(); diff --git a/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs b/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs index 202fe10a21..a088cd2457 100644 --- a/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs +++ b/tests/externalsystems/OfferProvider.Library/OfferProviderServiceTests.cs @@ -20,10 +20,10 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; using Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library.DependencyInjection; using Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library.Tests; @@ -51,7 +51,7 @@ public OfferProviderServiceTests() ClientId = "CatenaX", ClientSecret = "pass@Secret", GrantType = "cred", - TokenAddress = "https://key.cloak.com", + KeycloakTokenAddress = "https://key.cloak.com", }); _tokenService = A.Fake(); } diff --git a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj index ed8b34cf9d..c3722568a1 100644 --- a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj +++ b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProvider.Library.Tests.csproj @@ -45,6 +45,7 @@ + diff --git a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs index ae14ff72d7..b473959322 100644 --- a/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs +++ b/tests/externalsystems/OnboardingServiceProvider.Library.Tests/OnboardingServiceProviderServiceTests.cs @@ -19,9 +19,10 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; using Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.Models; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.OnboardingServiceProvider.Library.Tests; diff --git a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs index 26acaad7b6..d209bc1931 100644 --- a/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs +++ b/tests/externalsystems/SdFactory.Library.Tests/SdFactoryServiceTests.cs @@ -20,12 +20,12 @@ using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Framework.Token; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Net; namespace Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library.Tests; diff --git a/tests/framework/Framework.Async.Tests/Framework.Async.Tests.csproj b/tests/framework/Framework.Async.Tests/Framework.Async.Tests.csproj index cb3a2a568c..c7ecbd68ff 100644 --- a/tests/framework/Framework.Async.Tests/Framework.Async.Tests.csproj +++ b/tests/framework/Framework.Async.Tests/Framework.Async.Tests.csproj @@ -27,22 +27,23 @@ enable false - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - - + diff --git a/tests/framework/Framework.Async.Tests/IAsyncEnumerableExtensionTests.cs b/tests/framework/Framework.Async.Tests/IAsyncEnumerableExtensionTests.cs index 2ff8c79102..4e36785d07 100644 --- a/tests/framework/Framework.Async.Tests/IAsyncEnumerableExtensionTests.cs +++ b/tests/framework/Framework.Async.Tests/IAsyncEnumerableExtensionTests.cs @@ -18,14 +18,19 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared.Extensions; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using System.Collections.Immutable; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Async.Tests; public class AwaitAllIAsyncEnumerableExtensionTests { - private readonly IFixture _fixture = new Fixture(); + private readonly IFixture _fixture; + + public AwaitAllIAsyncEnumerableExtensionTests() + { + _fixture = new Fixture(); + } #region AwaitAll diff --git a/tests/framework/Framework.Async.Tests/Usings.cs b/tests/framework/Framework.Async.Tests/Usings.cs index d3b26fd130..d0c35ff438 100644 --- a/tests/framework/Framework.Async.Tests/Usings.cs +++ b/tests/framework/Framework.Async.Tests/Usings.cs @@ -19,6 +19,7 @@ ********************************************************************************/ global using AutoFixture; +global using AutoFixture.AutoFakeItEasy; global using FakeItEasy; global using FluentAssertions; global using Xunit; diff --git a/tests/framework/Framework.DBAccess.Tests/Framework.DBAccess.Tests.csproj b/tests/framework/Framework.DBAccess.Tests/Framework.DBAccess.Tests.csproj index 8184094ab7..0dc6b2a48b 100644 --- a/tests/framework/Framework.DBAccess.Tests/Framework.DBAccess.Tests.csproj +++ b/tests/framework/Framework.DBAccess.Tests/Framework.DBAccess.Tests.csproj @@ -20,29 +20,27 @@ - Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess.Tests - Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess.Tests net7.0 enable enable false - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - - diff --git a/tests/framework/Framework.ErrorHandling.Web.Tests/Framework.ErrorHandling.Web.Tests.csproj b/tests/framework/Framework.ErrorHandling.Web.Tests/Framework.ErrorHandling.Web.Tests.csproj index 9001fe901d..a89bf77909 100644 --- a/tests/framework/Framework.ErrorHandling.Web.Tests/Framework.ErrorHandling.Web.Tests.csproj +++ b/tests/framework/Framework.ErrorHandling.Web.Tests/Framework.ErrorHandling.Web.Tests.csproj @@ -1,4 +1,5 @@ - - - - Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared - Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared - net7.0 - enable - enable - false - - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - diff --git a/tests/framework/Framework.Tests.Shared/HttpMessageHandlerMock.cs b/tests/framework/Framework.Tests.Shared/HttpMessageHandlerMock.cs deleted file mode 100644 index 19d0b9eee6..0000000000 --- a/tests/framework/Framework.Tests.Shared/HttpMessageHandlerMock.cs +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 BMW Group AG - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -using System.Net; - -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; - -public class HttpMessageHandlerMock : HttpMessageHandler -{ - private readonly HttpStatusCode _statusCode; - private readonly Exception? _ex; - private readonly HttpContent? _httpContent; - private readonly bool _isRequestUri; - - public HttpMessageHandlerMock(HttpStatusCode statusCode, HttpContent? httpContent = null, Exception? ex = null, bool isRequestUri = false) - { - _statusCode = statusCode; - _httpContent = httpContent; - _ex = ex; - _isRequestUri = isRequestUri; - } - - protected override Task SendAsync( - HttpRequestMessage request, - CancellationToken cancellationToken) - { - RequestMessage = request; - - if (_ex != null) - { - throw _ex; - } - - var httpResponseMessage = new HttpResponseMessage(_statusCode) - { - RequestMessage = _isRequestUri ? request : null - }; - if (_httpContent != null) - { - httpResponseMessage.Content = _httpContent; - } - - return Task.FromResult(httpResponseMessage); - } - - public HttpRequestMessage? RequestMessage { get; private set; } = null; -} diff --git a/tests/framework/Framework.Tests.Shared/Usings.cs b/tests/framework/Framework.Tests.Shared/Usings.cs deleted file mode 100644 index 11347ce615..0000000000 --- a/tests/framework/Framework.Tests.Shared/Usings.cs +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -global using FakeItEasy; diff --git a/tests/framework/Framework.Token.Tests/Framework.Token.Tests.csproj b/tests/framework/Framework.Token.Tests/Framework.Token.Tests.csproj index c273feb0eb..e47a845e3e 100644 --- a/tests/framework/Framework.Token.Tests/Framework.Token.Tests.csproj +++ b/tests/framework/Framework.Token.Tests/Framework.Token.Tests.csproj @@ -41,8 +41,8 @@ - - + + diff --git a/tests/framework/Framework.Token.Tests/TokenServiceTests.cs b/tests/framework/Framework.Token.Tests/TokenServiceTests.cs index f6e4c847ea..8b41402c4d 100644 --- a/tests/framework/Framework.Token.Tests/TokenServiceTests.cs +++ b/tests/framework/Framework.Token.Tests/TokenServiceTests.cs @@ -19,8 +19,9 @@ ********************************************************************************/ using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Service; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using System.Net; using System.Text.Json; diff --git a/tests/framework/Framework.Web.Tests/Extensions/HttpExtensions.cs b/tests/framework/Framework.Web.Tests/Extensions/HttpExtensions.cs deleted file mode 100644 index 9ec8ea9c78..0000000000 --- a/tests/framework/Framework.Web.Tests/Extensions/HttpExtensions.cs +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -using System.Net.Http.Headers; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests.Extensions; - -public static class HttpExtensions -{ - public static async Task GetResultFromContent(this HttpResponseMessage response) - { - using var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false); - var options = new JsonSerializerOptions - { - Converters = { new JsonStringEnumConverter(allowIntegerValues: false) } - }; - return await JsonSerializer.DeserializeAsync(responseStream, options).ConfigureAwait(false) ?? throw new InvalidOperationException(); - } - - public static HttpContent ToJsonContent(this object data, JsonSerializerOptions options, string contentType) - { - var json = JsonSerializer.Serialize(data, options); - HttpContent content = new StringContent(json); - content.Headers.ContentType = new MediaTypeHeaderValue(contentType); - return content; - } - - public static HttpContent ToFormContent(this string stringContent, string contentType) - { - HttpContent content = new StringContent(stringContent); - content.Headers.ContentType = new MediaTypeHeaderValue(contentType); - return content; - } -} diff --git a/tests/framework/Framework.Web.Tests/Framework.Web.Tests.csproj b/tests/framework/Framework.Web.Tests/Framework.Web.Tests.csproj index 4ac1337184..ec8af90f63 100644 --- a/tests/framework/Framework.Web.Tests/Framework.Web.Tests.csproj +++ b/tests/framework/Framework.Web.Tests/Framework.Web.Tests.csproj @@ -19,7 +19,7 @@ - Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests + Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests net7.0 enable @@ -30,7 +30,6 @@ - @@ -43,6 +42,8 @@ + + diff --git a/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs b/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs index 2c92fd23f4..b6151867e7 100644 --- a/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs +++ b/tests/framework/Framework.Web.Tests/HealthCheckExtensionsTests.cs @@ -1,4 +1,5 @@ /******************************************************************************** + * Copyright (c) 2021, 2023 BMW Group AG * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional @@ -21,6 +22,7 @@ using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; using System.Text.Json; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests; @@ -51,7 +53,7 @@ public void MapDefaultHealthChecks_AmbiguousPathes_Throws() var app = WebApplication.Create(); - var result = Assert.Throws(() => app.MapDefaultHealthChecks(settings)); + var result = Assert.Throws(() => app.MapDefaultHealthChecks(settings)); result.Message.Should().Be("HealthChecks mapping /foo, /foo contains ambiguous pathes"); } diff --git a/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs b/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs index 8610209288..988a52448b 100644 --- a/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs +++ b/tests/framework/Framework.Web.Tests/JwtBearerConfigurationHealthCheckTests.cs @@ -1,4 +1,5 @@ /******************************************************************************** + * Copyright (c) 2021, 2023 BMW Group AG * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional @@ -21,7 +22,8 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Protocols.OpenIdConnect; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests.Extensions; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using System.Net; using System.Text.Json; @@ -42,7 +44,7 @@ public JwtBearerConfigurationHealthCheckTests() public async Task CheckHealthAsync_Success_ReturnsExpected() { // Arrange - var config = OpenIdConnectConfiguration.Create("{\"authorization_endpoint\": \"https://login.example.org/\",\n \"token_endpoint\": \"https://login.example.org/oauth2/v2.0/token\",\n \"token_endpoint_auth_methods_supported\": [\n \"client_secret_post\",\n \"private_key_jwt\"\n ],\n \"jwks_uri\": \"https://login.example.org/discovery/v2.0/keys\",\n \"userinfo_endpoint\": \"https://graph.example.org/oidc/userinfo\",\n \"subject_types_supported\": [\n \"pairwise\"\n ] }"); + var config = _fixture.Create(); var jsonOptions = new JsonSerializerOptions() { PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase }; diff --git a/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs b/tests/framework/Framework.Web.Tests/MandatoryIdentityClaimHandlerTests.cs similarity index 98% rename from tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs rename to tests/framework/Framework.Web.Tests/MandatoryIdentityClaimHandlerTests.cs index 20d099acc1..d1fc6889ba 100644 --- a/tests/web/Web.Identity.Tests/MandatoryIdentityClaimHandlerTests.cs +++ b/tests/framework/Framework.Web.Tests/MandatoryIdentityClaimHandlerTests.cs @@ -20,11 +20,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Security.Claims; namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests; diff --git a/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs b/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs index 196816e5f8..4adbdc8faa 100644 --- a/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs +++ b/tests/keycloak/Keycloak.Authentication.Tests/KeycloakClaimsTransformationTests.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.Security.Claims; namespace Org.Eclipse.TractusX.Portal.Backend.Keycloak.Authentication.Tests; diff --git a/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj b/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj index c646207d84..3bcf4b8385 100644 --- a/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj +++ b/tests/marketplace/Apps.Service.Tests/Apps.Service.Tests.csproj @@ -49,7 +49,6 @@ - diff --git a/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj b/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj index 94749bb050..e34d37f65c 100644 --- a/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj +++ b/tests/marketplace/Services.Service.Tests/Services.Service.Tests.csproj @@ -49,7 +49,6 @@ - diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/ApplicationRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/ApplicationRepositoryTests.cs index 84ceb8fce1..99c233dff4 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/ApplicationRepositoryTests.cs +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/ApplicationRepositoryTests.cs @@ -19,6 +19,7 @@ ********************************************************************************/ using Microsoft.EntityFrameworkCore; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests.Setup; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities; diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRolesRepositoryTests.cs b/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRolesRepositoryTests.cs index 1f2bb28cfb..ceca163c2a 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRolesRepositoryTests.cs +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/CompanyRolesRepositoryTests.cs @@ -21,6 +21,7 @@ using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests.Setup; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities; +using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; using Xunit.Extensions.AssemblyFixture; diff --git a/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj b/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj index d55085bd40..9a48e0b174 100644 --- a/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj +++ b/tests/portalbackend/PortalBackend.DBAccess.Tests/PortalBackend.DBAccess.Tests.csproj @@ -1,58 +1,334 @@ - - - - Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests - Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests - net7.0 - enable - enable - false - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - - + + + + Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests + Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Tests + net7.0 + enable + enable + false + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + Seeder\Data\ + + + diff --git a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs index 4936bd8c90..92d5a9de32 100644 --- a/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs +++ b/tests/processes/Processes.Worker.Library.Tests/ProcessExecutionServiceTests.cs @@ -22,12 +22,12 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; +using Org.Eclipse.TractusX.Portal.Backend.Framework.ProcessIdentity; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Repositories; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums; -using Org.Eclipse.TractusX.Portal.Backend.Processes.ProcessIdentity; +using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; using System.Collections.Immutable; namespace Org.Eclipse.TractusX.Portal.Backend.Processes.Worker.Library.Tests; diff --git a/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj b/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj index 53492b3503..8ae32c1fe9 100644 --- a/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj +++ b/tests/registration/Registration.Service.Tests/Registration.Service.Tests.csproj @@ -49,6 +49,7 @@ + diff --git a/tests/shared/Tests.Shared/Extensions/ControllerExtensions.cs b/tests/shared/Tests.Shared/Extensions/ControllerExtensions.cs index 614f7462c5..a27c6f3545 100644 --- a/tests/shared/Tests.Shared/Extensions/ControllerExtensions.cs +++ b/tests/shared/Tests.Shared/Extensions/ControllerExtensions.cs @@ -19,8 +19,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Identities; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; using System.Security.Claims; namespace Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; diff --git a/tests/framework/Framework.Tests.Shared/Extensions/HttpExtensions.cs b/tests/shared/Tests.Shared/Extensions/HttpExtensions.cs similarity index 100% rename from tests/framework/Framework.Tests.Shared/Extensions/HttpExtensions.cs rename to tests/shared/Tests.Shared/Extensions/HttpExtensions.cs diff --git a/tests/framework/Framework.Web.Tests/HttpMessageHandlerMock.cs b/tests/shared/Tests.Shared/HttpMessageHandlerMock.cs similarity index 95% rename from tests/framework/Framework.Web.Tests/HttpMessageHandlerMock.cs rename to tests/shared/Tests.Shared/HttpMessageHandlerMock.cs index 3006bc075e..d94308740d 100644 --- a/tests/framework/Framework.Web.Tests/HttpMessageHandlerMock.cs +++ b/tests/shared/Tests.Shared/HttpMessageHandlerMock.cs @@ -1,4 +1,5 @@ /******************************************************************************** + * Copyright (c) 2021, 2023 BMW Group AG * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional @@ -19,7 +20,7 @@ using System.Net; -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Web.Tests; +namespace Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; public class HttpMessageHandlerMock : HttpMessageHandler { diff --git a/tests/shared/Tests.Shared/IntegrationTests/BasePublicUrlTests.cs b/tests/shared/Tests.Shared/IntegrationTests/BasePublicUrlTests.cs index dc9373bbcb..9ac40537b2 100644 --- a/tests/shared/Tests.Shared/IntegrationTests/BasePublicUrlTests.cs +++ b/tests/shared/Tests.Shared/IntegrationTests/BasePublicUrlTests.cs @@ -19,9 +19,9 @@ ********************************************************************************/ using FluentAssertions; +using Org.Eclipse.TractusX.Portal.Backend.Framework.PublicInfos; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.Extensions; using Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.TestSeeds; -using Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos; using System.Linq.Expressions; using System.Net; using Xunit; diff --git a/tests/shared/Tests.Shared/IntegrationTests/FakePolicyEvaluator.cs b/tests/shared/Tests.Shared/IntegrationTests/FakePolicyEvaluator.cs index 93a40d1c72..dab99eed9f 100644 --- a/tests/shared/Tests.Shared/IntegrationTests/FakePolicyEvaluator.cs +++ b/tests/shared/Tests.Shared/IntegrationTests/FakePolicyEvaluator.cs @@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization.Policy; using Microsoft.AspNetCore.Http; -using Org.Eclipse.TractusX.Portal.Backend.Web.Identity; +using Org.Eclipse.TractusX.Portal.Backend.Framework.Models; using System.Security.Claims; namespace Org.Eclipse.TractusX.Portal.Backend.Tests.Shared.IntegrationTests; diff --git a/tests/framework/Framework.Tests.Shared/MockLogger.cs b/tests/shared/Tests.Shared/MockLogger.cs similarity index 94% rename from tests/framework/Framework.Tests.Shared/MockLogger.cs rename to tests/shared/Tests.Shared/MockLogger.cs index 42a185f30d..4f173ab0c4 100644 --- a/tests/framework/Framework.Tests.Shared/MockLogger.cs +++ b/tests/shared/Tests.Shared/MockLogger.cs @@ -1,4 +1,5 @@ /******************************************************************************** + * Copyright (c) 2021, 2023 BMW Group AG * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional @@ -19,7 +20,7 @@ using Microsoft.Extensions.Logging; -namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Tests.Shared; +namespace Org.Eclipse.TractusX.Portal.Backend.Tests.Shared; public interface IMockLogger { diff --git a/tests/shared/Tests.Shared/Tests.Shared.csproj b/tests/shared/Tests.Shared/Tests.Shared.csproj index aeec2bb810..d1ebeb3bc6 100644 --- a/tests/shared/Tests.Shared/Tests.Shared.csproj +++ b/tests/shared/Tests.Shared/Tests.Shared.csproj @@ -29,16 +29,34 @@ + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - + + + + - - + diff --git a/tests/web/Web.PublicInfos.Tests/Usings.cs b/tests/web/Web.PublicInfos.Tests/Usings.cs deleted file mode 100644 index d0c35ff438..0000000000 --- a/tests/web/Web.PublicInfos.Tests/Usings.cs +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021, 2023 BMW Group AG - * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ - -global using AutoFixture; -global using AutoFixture.AutoFakeItEasy; -global using FakeItEasy; -global using FluentAssertions; -global using Xunit; diff --git a/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj b/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj deleted file mode 100644 index f7f475319e..0000000000 --- a/tests/web/Web.PublicInfos.Tests/Web.PublicInfos.Tests.csproj +++ /dev/null @@ -1,48 +0,0 @@ - - - - - Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.Tests - Org.Eclipse.TractusX.Portal.Backend.Web.PublicInfos.Tests - net7.0 - enable - enable - false - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - -