diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml
index be07a6716a..724c70bdb8 100644
--- a/.github/workflows/dependencies.yaml
+++ b/.github/workflows/dependencies.yaml
@@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- dotnet-version: ['6.0']
+ dotnet-version: ['7.0']
steps:
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index f7b8281ed1..409f9aa03e 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- dotnet-version: ['6.0']
+ dotnet-version: ['7.0']
steps:
- name: Set up JDK 17
diff --git a/.github/workflows/test-automation.yml b/.github/workflows/test-automation.yml
index c962f3255f..9e7399ff28 100644
--- a/.github/workflows/test-automation.yml
+++ b/.github/workflows/test-automation.yml
@@ -45,7 +45,7 @@ jobs:
environment: ${{ github.event.inputs.environment }}
strategy:
matrix:
- dotnet-version: [ '6.0' ]
+ dotnet-version: [ '7.0' ]
steps:
- name: Checkout
diff --git a/.github/workflows/unit.tests-formatting.yml b/.github/workflows/unit.tests-formatting.yml
index 9e19af4ff1..45247b54d0 100644
--- a/.github/workflows/unit.tests-formatting.yml
+++ b/.github/workflows/unit.tests-formatting.yml
@@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- dotnet-version: ['6.0']
+ dotnet-version: ['7.0']
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 571af10a37..523939556c 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -36,7 +36,7 @@ on:
env:
- DOTNET_VERSION: '6.0' # The .NET SDK version to use
+ DOTNET_VERSION: '7.0' # The .NET SDK version to use
jobs:
analyze-administration-service:
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 2f46e6a08e..afcb16d1bf 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,54 +1,57 @@
-nuget/nuget/-/AutoFixture.AutoFakeItEasy/4.17.0, MIT, approved, #3193
-nuget/nuget/-/AutoFixture.Xunit/4.17.0, MIT, approved, #3188
-nuget/nuget/-/AutoFixture/4.17.0, MIT, approved, clearlydefined
+nuget/nuget/-/AutoFixture.AutoFakeItEasy/4.18.0, MIT, approved, #10064
+nuget/nuget/-/AutoFixture.Xunit/4.18.0, MIT, approved, #10082
+nuget/nuget/-/AutoFixture/4.18.0, MIT, approved, #10057
+nuget/nuget/-/BouncyCastle.Cryptography/2.2.1, MIT AND Apache-2.0 AND BSD-3-Clause AND LicenseRef-Permission-Notice, approved, #10066
nuget/nuget/-/Castle.Core/4.3.1, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/EFCore.NamingConventions/6.0.0, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/FakeItEasy/7.3.1, MIT, approved, #3200
+nuget/nuget/-/EFCore.NamingConventions/7.0.2, Apache-2.0, approved, #10067
+nuget/nuget/-/FakeItEasy/7.4.0, MIT, approved, #10080
nuget/nuget/-/Fare/2.1.1, MIT, approved, clearlydefined
-nuget/nuget/-/FluentAssertions/6.7.0, Apache-2.0, approved, clearlydefined
+nuget/nuget/-/FluentAssertions/6.11.0, Apache-2.0 AND MIT, approved, #10061
nuget/nuget/-/Flurl.Http.Signed/3.2.4, MIT, approved, #3503
nuget/nuget/-/Flurl.Signed/3.0.6, MIT, approved, #3501
-nuget/nuget/-/Humanizer.Core/2.8.26, MIT, approved, clearlydefined
-nuget/nuget/-/Laraue.EfCoreTriggers.Common/6.3.6, MIT, approved, #5910
-nuget/nuget/-/Laraue.EfCoreTriggers.PostgreSql/6.3.6, MIT, approved, #5911
-nuget/nuget/-/MailKit/2.15.0, MIT, approved, clearlydefined
-nuget/nuget/-/MimeKit/2.15.1, MIT, approved, clearlydefined
+nuget/nuget/-/Humanizer.Core/2.14.1, MIT, approved, #10060
+nuget/nuget/-/Laraue.EfCoreTriggers.Common/7.1.1, MIT, approved, #10247
+nuget/nuget/-/Laraue.EfCoreTriggers.PostgreSql/7.1.1, MIT, approved, #10248
+nuget/nuget/-/MailKit/4.1.0, MIT, approved, #10076
+nuget/nuget/-/MimeKit/4.1.0, BSD-3-Clause AND LicenseRef-Permission-Notice AND LicenseRef-FSF AND LicenseRef-Permissive-license-with-conditions AND MIT AND CC-PDDC, approved, #10079
+nuget/nuget/-/Mono.TextTemplating/2.2.1, MIT, approved, clearlydefined
nuget/nuget/-/Newtonsoft.Json/12.0.2, MIT, approved, clearlydefined
-nuget/nuget/-/Newtonsoft.Json/13.0.2, MIT AND BSD-3-Clause, approved, #3266
-nuget/nuget/-/Newtonsoft.Json/9.0.1, MIT, approved, clearlydefined
-nuget/nuget/-/Npgsql.EntityFrameworkCore.PostgreSQL/6.0.7, PostgreSQL AND MIT AND Apache-2.0, approved, #5912
-nuget/nuget/-/Npgsql/6.0.7, LicenseRef-BSD-style, approved, #5913
+nuget/nuget/-/Newtonsoft.Json/13.0.1, MIT AND BSD-3-Clause, approved, #3266
+nuget/nuget/-/Newtonsoft.Json/13.0.3, MIT AND BSD-3-Clause, approved, #3266
+nuget/nuget/-/Npgsql.EntityFrameworkCore.PostgreSQL/7.0.4, PostgreSQL AND MIT AND Apache-2.0, approved, #10081
+nuget/nuget/-/Npgsql/7.0.4, PostgreSQL, approved, #10062
nuget/nuget/-/PasswordGenerator/2.1.0, MIT, approved, #3192
-nuget/nuget/-/Portable.BouncyCastle/1.8.10, MIT, approved, clearlydefined
-nuget/nuget/-/Serilog.AspNetCore/6.1.0, Apache-2.0 AND MIT, approved, #8437
+nuget/nuget/-/Portable.BouncyCastle/1.9.0, MIT, approved, clearlydefined
+nuget/nuget/-/SSH.NET/2020.0.2, MIT AND ISC AND LicenseRef-Public-domain AND (MIT AND MS-PL), approved, #10073
+nuget/nuget/-/Serilog.AspNetCore/7.0.0, Apache-2.0 AND MIT, approved, #10084
nuget/nuget/-/Serilog.Enrichers.CorrelationId/3.0.1, MIT, approved, clearlydefined
nuget/nuget/-/Serilog.Enrichers.Environment/2.2.0, Apache-2.0, approved, clearlydefined
nuget/nuget/-/Serilog.Enrichers.Process/2.0.2, Apache-2.0, approved, clearlydefined
nuget/nuget/-/Serilog.Enrichers.Thread/3.1.0, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/Serilog.Extensions.Hosting/5.0.1, Apache-2.0, approved, #8436
-nuget/nuget/-/Serilog.Extensions.Logging/3.1.0, Apache-2.0, approved, clearlydefined
+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, clearlydefined
-nuget/nuget/-/Serilog.Settings.Configuration/3.4.0, Apache-2.0, approved, #8433
+nuget/nuget/-/Serilog.Settings.Configuration/7.0.0, Apache-2.0, approved, #10069
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, clearlydefined
-nuget/nuget/-/Serilog/2.12.0, Apache-2.0, approved, #8435
-nuget/nuget/-/SharpZipLib/1.3.3, GFDL-1.3-or-later AND Apache-2.0 AND BSD-3-Clause AND MIT AND WTFPL AND bzip2-1.0.6, approved, #3264
+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
nuget/nuget/-/SwashBuckle.AspNetCore/6.5.0, MIT AND Apache-2.0, approved, #7159
nuget/nuget/-/Swashbuckle.AspNetCore.Swagger/6.5.0, MIT AND Apache-2.0, approved, #7160
nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerGen/6.5.0, MIT AND Apache-2.0, approved, #7156
nuget/nuget/-/Swashbuckle.AspNetCore.SwaggerUI/6.5.0, MIT AND Apache-2.0, approved, #7158
nuget/nuget/-/Swashbuckle.AspNetCore/6.5.0, MIT AND Apache-2.0, approved, #7159
-nuget/nuget/-/Testcontainers/2.1.0, MIT, approved, clearlydefined
+nuget/nuget/-/Testcontainers.PostgreSql/3.4.0, MIT, approved, #10056
+nuget/nuget/-/Testcontainers/3.4.0, MIT, approved, #10083
nuget/nuget/-/Xunit.Extensions.AssemblyFixture/2.4.1, MIT, approved, #3502
-nuget/nuget/-/coverlet.collector/3.1.0, MIT, approved, #3187
-nuget/nuget/-/coverlet.collector/3.1.2, MIT, approved, #3187
+nuget/nuget/-/coverlet.collector/6.0.0, MIT, approved, #10075
nuget/nuget/-/xunit.abstractions/2.0.3, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/xunit.analyzers/0.10.0, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/xunit.assert/2.4.1, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/xunit.core/2.4.1, MIT AND Apache-2.0, approved, #5914
-nuget/nuget/-/xunit.extensibility.core/2.4.1, Apache-2.0, approved, clearlydefined
-nuget/nuget/-/xunit.extensibility.execution/2.4.1, Apache-2.0 AND MIT, approved, #3199
-nuget/nuget/-/xunit.runner.visualstudio/2.4.3, Apache-2.0 AND MIT, approved, #3265
-nuget/nuget/-/xunit.runner.visualstudio/2.4.5, Apache-2.0 AND MIT, approved, #3265
-nuget/nuget/-/xunit/2.4.1, Apache-2.0 AND MIT, approved, #8438
+nuget/nuget/-/xunit.analyzers/1.2.0, Apache-2.0 AND MIT, approved, #10068
+nuget/nuget/-/xunit.assert/2.5.0, Apache-2.0 AND MIT, approved, #10071
+nuget/nuget/-/xunit.core/2.5.0, Apache-2.0 AND MIT, approved, #10059
+nuget/nuget/-/xunit.extensibility.core/2.5.0, Apache-2.0 AND MIT, approved, #10077
+nuget/nuget/-/xunit.extensibility.execution/2.5.0, Apache-2.0 AND MIT, approved, #10074
+nuget/nuget/-/xunit.runner.visualstudio/2.5.0, Apache-2.0 AND MIT, approved, #10065
+nuget/nuget/-/xunit/2.5.0, Apache-2.0 AND MIT, approved, #10072
diff --git a/README.md b/README.md
index f22df8887b..880875bced 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ The Catena-X Portal is designed to work with the [Catena-X IAM](https://github.c
## How to build and run
-Install [the .NET 6.0 SDK](https://www.microsoft.com/net/download).
+Install [the .NET 7.0 SDK](https://www.microsoft.com/net/download).
Run the following command from the CLI:
@@ -48,15 +48,15 @@ This application provides container images for demonstration purposes.
### Base images
-mcr.microsoft.com/dotnet/aspnet:6.0-alpine:
+mcr.microsoft.com/dotnet/aspnet:7.0-alpine:
-* Dockerfile: [mcr.microsoft.com/dotnet/aspnet:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.17/amd64/Dockerfile)
+* Dockerfile: [mcr.microsoft.com/dotnet/aspnet:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.17/amd64/Dockerfile)
* GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
* DockerHub: [https://hub.docker.com/_/microsoft-dotnet-aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet)
-mcr.microsoft.com/dotnet/runtime:6.0-alpine:
+mcr.microsoft.com/dotnet/runtime:7.0-alpine:
-* Dockerfile: [mcr.microsoft.com/dotnet/runtime:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.17/amd64/Dockerfile)
+* Dockerfile: [mcr.microsoft.com/dotnet/runtime:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.17/amd64/Dockerfile)
* 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)
diff --git a/docker/Dockerfile-administration-service b/docker/Dockerfile-administration-service
index 669f3673f2..6c73fbf005 100644
--- a/docker/Dockerfile-administration-service
+++ b/docker/Dockerfile-administration-service
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/ src/
diff --git a/docker/Dockerfile-iam-seeding b/docker/Dockerfile-iam-seeding
index 9bdee0530a..1f6703e0e8 100644
--- a/docker/Dockerfile-iam-seeding
+++ b/docker/Dockerfile-iam-seeding
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY /src/framework/Framework.Async /src/framework/Framework.Async
diff --git a/docker/Dockerfile-maintenance-service b/docker/Dockerfile-maintenance-service
index c8fbc7c185..e82294b199 100644
--- a/docker/Dockerfile-maintenance-service
+++ b/docker/Dockerfile-maintenance-service
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/maintenance/Maintenance.App/ src/maintenance/Maintenance.App/
diff --git a/docker/Dockerfile-marketplace-app-service b/docker/Dockerfile-marketplace-app-service
index ecd2d34bbd..dd95275fad 100644
--- a/docker/Dockerfile-marketplace-app-service
+++ b/docker/Dockerfile-marketplace-app-service
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/ src/
diff --git a/docker/Dockerfile-notification-service b/docker/Dockerfile-notification-service
index 6beabde59a..1f5bd549c1 100644
--- a/docker/Dockerfile-notification-service
+++ b/docker/Dockerfile-notification-service
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/ src/
diff --git a/docker/Dockerfile-portal-migrations b/docker/Dockerfile-portal-migrations
index ceb233b64f..1cb79587f4 100644
--- a/docker/Dockerfile-portal-migrations
+++ b/docker/Dockerfile-portal-migrations
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY /src/portalbackend /src/portalbackend
diff --git a/docker/Dockerfile-processes-worker b/docker/Dockerfile-processes-worker
index d54a0f499b..be8f9c2c97 100644
--- a/docker/Dockerfile-processes-worker
+++ b/docker/Dockerfile-processes-worker
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/ src/
diff --git a/docker/Dockerfile-provisioning-migrations b/docker/Dockerfile-provisioning-migrations
index 0e48c32055..46989d275e 100644
--- a/docker/Dockerfile-provisioning-migrations
+++ b/docker/Dockerfile-provisioning-migrations
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY /src/provisioning /src/provisioning
diff --git a/docker/Dockerfile-registration-service b/docker/Dockerfile-registration-service
index 2daceb8d48..741a13b159 100644
--- a/docker/Dockerfile-registration-service
+++ b/docker/Dockerfile-registration-service
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/ src/
diff --git a/docker/Dockerfile-services-service b/docker/Dockerfile-services-service
index d86a7a5c23..7d86cfbdde 100644
--- a/docker/Dockerfile-services-service
+++ b/docker/Dockerfile-services-service
@@ -17,9 +17,9 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
WORKDIR /
COPY LICENSE NOTICE.md DEPENDENCIES /
COPY src/ src/
diff --git a/docker/notice-administration-service.md b/docker/notice-administration-service.md
index 484293b2cd..6639914696 100644
--- a/docker/notice-administration-service.md
+++ b/docker/notice-administration-service.md
@@ -13,7 +13,7 @@ __Portal Administration Service__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.17/amd64/Dockerfile)
- GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
- DockerHub: [https://hub.docker.com/_/microsoft-dotnet-aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet)
diff --git a/docker/notice-maintenance-service.md b/docker/notice-maintenance-service.md
index 2479e7b48c..c48d07ffae 100644
--- a/docker/notice-maintenance-service.md
+++ b/docker/notice-maintenance-service.md
@@ -13,7 +13,7 @@ __Portal Checklist Worker__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/runtime:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/runtime:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.17/amd64/Dockerfile)
- 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)
diff --git a/docker/notice-marketplace-app-service.md b/docker/notice-marketplace-app-service.md
index 577a2db56e..a52cb6f9a5 100644
--- a/docker/notice-marketplace-app-service.md
+++ b/docker/notice-marketplace-app-service.md
@@ -13,7 +13,7 @@ __Portal Administration Service__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.17/amd64/Dockerfile)
- GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
- DockerHub: [https://hub.docker.com/_/microsoft-dotnet-aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet)
diff --git a/docker/notice-notification-service.md b/docker/notice-notification-service.md
index 9dd0227761..fa329fa051 100644
--- a/docker/notice-notification-service.md
+++ b/docker/notice-notification-service.md
@@ -13,7 +13,7 @@ __Portal Administration Service__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.17/amd64/Dockerfile)
- GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
- DockerHub: [https://hub.docker.com/_/microsoft-dotnet-aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet)
diff --git a/docker/notice-portal-migrations.md b/docker/notice-portal-migrations.md
index ac4e2d8d22..3b52c58ec6 100644
--- a/docker/notice-portal-migrations.md
+++ b/docker/notice-portal-migrations.md
@@ -13,7 +13,7 @@ __Portal Checklist Worker__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/runtime:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/runtime:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.17/amd64/Dockerfile)
- 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)
diff --git a/docker/notice-processes-worker.md b/docker/notice-processes-worker.md
index 888b4c18ed..d39bf4ed72 100644
--- a/docker/notice-processes-worker.md
+++ b/docker/notice-processes-worker.md
@@ -13,7 +13,7 @@ __Portal Checklist Worker__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/runtime:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/runtime:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.17/amd64/Dockerfile)
- 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)
diff --git a/docker/notice-provisioning-migrations.md b/docker/notice-provisioning-migrations.md
index 3f8c420598..dce5143745 100644
--- a/docker/notice-provisioning-migrations.md
+++ b/docker/notice-provisioning-migrations.md
@@ -13,7 +13,7 @@ __Portal Checklist Worker__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/runtime:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/runtime:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.17/amd64/Dockerfile)
- 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)
diff --git a/docker/notice-registration-service.md b/docker/notice-registration-service.md
index 83771297ab..423fe7fb2f 100644
--- a/docker/notice-registration-service.md
+++ b/docker/notice-registration-service.md
@@ -13,7 +13,7 @@ __Portal Administration Service__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.17/amd64/Dockerfile)
- GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
- DockerHub: [https://hub.docker.com/_/microsoft-dotnet-aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet)
diff --git a/docker/notice-services-service.md b/docker/notice-services-service.md
index 782efffd3c..c32959a76d 100644
--- a/docker/notice-services-service.md
+++ b/docker/notice-services-service.md
@@ -13,7 +13,7 @@ __Portal Administration Service__
__Used base images__
-- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:6.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/6.0/alpine3.17/amd64/Dockerfile)
+- Dockerfile: [mcr.microsoft.com/dotnet/aspnet:7.0-alpine](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.17/amd64/Dockerfile)
- GitHub project: [https://github.com/dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker)
- DockerHub: [https://hub.docker.com/_/microsoft-dotnet-aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet)
diff --git a/src/administration/Administration.Service/Administration.Service.csproj b/src/administration/Administration.Service/Administration.Service.csproj
index ec09183555..72c01dff18 100644
--- a/src/administration/Administration.Service/Administration.Service.csproj
+++ b/src/administration/Administration.Service/Administration.Service.csproj
@@ -23,7 +23,7 @@
Org.Eclipse.TractusX.Portal.Backend.Administration.Service
Org.Eclipse.TractusX.Portal.Backend.Administration.Service
- net6.0
+ net7.0
enable
enable
ad1c79a3-a042-4d59-8924-475f8ff4c37a
@@ -34,11 +34,11 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/administration/Administration.Service/Controllers/CompanyDataController.cs b/src/administration/Administration.Service/Controllers/CompanyDataController.cs
index 6111e464b0..7e8ab7e66e 100644
--- a/src/administration/Administration.Service/Controllers/CompanyDataController.cs
+++ b/src/administration/Administration.Service/Controllers/CompanyDataController.cs
@@ -24,7 +24,6 @@
using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
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 System.Net;
diff --git a/src/administration/Administration.Service/Controllers/ConnectorsController.cs b/src/administration/Administration.Service/Controllers/ConnectorsController.cs
index cc75341eab..5f9587bebe 100644
--- a/src/administration/Administration.Service/Controllers/ConnectorsController.cs
+++ b/src/administration/Administration.Service/Controllers/ConnectorsController.cs
@@ -25,7 +25,6 @@
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.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.SdFactory.Library.Models;
diff --git a/src/administration/Administration.Service/Controllers/InvitationController.cs b/src/administration/Administration.Service/Controllers/InvitationController.cs
index 449350cd50..e776a39072 100644
--- a/src/administration/Administration.Service/Controllers/InvitationController.cs
+++ b/src/administration/Administration.Service/Controllers/InvitationController.cs
@@ -24,7 +24,6 @@
using Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
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;
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 b551b80ad7..406f58167f 100644
--- a/src/administration/Administration.Service/Controllers/RegistrationController.cs
+++ b/src/administration/Administration.Service/Controllers/RegistrationController.cs
@@ -25,7 +25,6 @@
using Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library.Models;
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.SdFactory.Library.Models;
diff --git a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
index 7d3e0daf02..fe2d1e2f71 100644
--- a/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
+++ b/src/externalsystems/Bpdm.Library/Bpdm.Library.csproj
@@ -21,7 +21,7 @@
- net6.0
+ net7.0
enable
enable
Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library
@@ -38,7 +38,7 @@
-
+
diff --git a/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj b/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj
index 6bbc4daa98..f2e57ab883 100644
--- a/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj
+++ b/src/externalsystems/Clearinghouse.Library/Clearinghouse.Library.csproj
@@ -21,7 +21,7 @@
- net6.0
+ net7.0
enable
enable
Org.Eclipse.TractusX.Portal.Backend.Clearinghouse.Library
@@ -37,7 +37,7 @@
-
+
diff --git a/src/externalsystems/Custodian.Library/Custodian.Library.csproj b/src/externalsystems/Custodian.Library/Custodian.Library.csproj
index de62ddf80e..3f25b65cb0 100644
--- a/src/externalsystems/Custodian.Library/Custodian.Library.csproj
+++ b/src/externalsystems/Custodian.Library/Custodian.Library.csproj
@@ -21,7 +21,7 @@
- net6.0
+ net7.0
enable
enable
Org.Eclipse.TractusX.Portal.Backend.Custodian.Library
@@ -39,7 +39,7 @@
-
+
diff --git a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
index 9f8d5e6b54..28a88517b4 100644
--- a/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
+++ b/src/externalsystems/OfferProvider.Library/OfferProvider.Library.csproj
@@ -21,7 +21,7 @@
- net6.0
+ net7.0
enable
enable
Org.Eclipse.TractusX.Portal.Backend.OfferProvider.Library
diff --git a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
index f1a590b7c8..cb58ba2de3 100644
--- a/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
+++ b/src/externalsystems/SdFactory.Library/SdFactory.Library.csproj
@@ -21,7 +21,7 @@
- net6.0
+ net7.0
enable
enable
Org.Eclipse.TractusX.Portal.Backend.SdFactory.Library
@@ -37,7 +37,7 @@
-
+
diff --git a/src/framework/Framework.Async/Framework.Async.csproj b/src/framework/Framework.Async/Framework.Async.csproj
index 3217270c55..4c0bfdd935 100644
--- a/src/framework/Framework.Async/Framework.Async.csproj
+++ b/src/framework/Framework.Async/Framework.Async.csproj
@@ -21,7 +21,7 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.Async
- net6.0
+ net7.0
enable
enable
diff --git a/src/framework/Framework.Authorization/Framework.Authorization.csproj b/src/framework/Framework.Authorization/Framework.Authorization.csproj
index 5a7fd3b194..206231d87a 100644
--- a/src/framework/Framework.Authorization/Framework.Authorization.csproj
+++ b/src/framework/Framework.Authorization/Framework.Authorization.csproj
@@ -21,12 +21,12 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.Authorization
- net6.0
+ net7.0
enable
enable
-
+
diff --git a/src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj b/src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj
index 29dc0caba8..f163b9abe8 100644
--- a/src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj
+++ b/src/framework/Framework.BaseDependencies/Framework.BaseDependencies.csproj
@@ -22,13 +22,13 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.BaseDependencies
- net6.0
+ net7.0
enable
enable
-
+
diff --git a/src/framework/Framework.Cors/CorsExtensions.cs b/src/framework/Framework.Cors/CorsExtensions.cs
index a787b6d801..07f499b510 100644
--- a/src/framework/Framework.Cors/CorsExtensions.cs
+++ b/src/framework/Framework.Cors/CorsExtensions.cs
@@ -38,7 +38,7 @@ public static class CorsExtensions
public static void SetupCors(this CorsOptions corsOption, IConfigurationRoot configuration)
{
var corsConfig = configuration.Get();
- if (corsConfig.Cors?.AllowedOrigins?.Any() ?? false)
+ if (corsConfig?.Cors?.AllowedOrigins?.Any() ?? false)
{
corsOption.AddPolicy(AllowSpecificOrigins, policy =>
{
diff --git a/src/framework/Framework.Cors/Framework.Cors.csproj b/src/framework/Framework.Cors/Framework.Cors.csproj
index 201fb3528a..90ac3ad69e 100644
--- a/src/framework/Framework.Cors/Framework.Cors.csproj
+++ b/src/framework/Framework.Cors/Framework.Cors.csproj
@@ -20,13 +20,18 @@
- Org.Eclipse.TractusX.Portal.Backend.Framework.Cors
- net6.0
- enable
- enable
+ Org.Eclipse.TractusX.Portal.Backend.Framework.Cors
+ Org.Eclipse.TractusX.Portal.Backend.Framework.Cors
+ net7.0
+ enable
+ enable
+
+
+
+
+
-
-
+
diff --git a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj
index fe8fa9fa40..7f3b022694 100644
--- a/src/framework/Framework.DBAccess/Framework.DBAccess.csproj
+++ b/src/framework/Framework.DBAccess/Framework.DBAccess.csproj
@@ -21,11 +21,11 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess
Org.Eclipse.TractusX.Portal.Backend.Framework.DBAccess
- net6.0
+ net7.0
enable
enable
-
+
diff --git a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj
index c8a725015b..a672a18ab6 100644
--- a/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj
+++ b/src/framework/Framework.DateTimeProvider/Framework.DateTimeProvider.csproj
@@ -22,11 +22,11 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider
Org.Eclipse.TractusX.Portal.Backend.Framework.DateTimeProvider
- net6.0
+ net7.0
enable
enable
-
+
diff --git a/src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj b/src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj
index de296ac292..0f21d0ca23 100644
--- a/src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj
+++ b/src/framework/Framework.ErrorHandling.Library/Framework.ErrorHandling.Library.csproj
@@ -23,13 +23,13 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library
Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Library
- net6.0
+ net7.0
enable
enable
-
+
diff --git a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj
index ae799e9ff7..9b2021c084 100644
--- a/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj
+++ b/src/framework/Framework.ErrorHandling.Web/Framework.ErrorHandling.Web.csproj
@@ -23,14 +23,14 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web
Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling.Web
- net6.0
+ net7.0
enable
enable
-
+
diff --git a/src/framework/Framework.HttpClient/Framework.HttpClient.csproj b/src/framework/Framework.HttpClient/Framework.HttpClient.csproj
index 3ace94541d..230e62021d 100644
--- a/src/framework/Framework.HttpClient/Framework.HttpClient.csproj
+++ b/src/framework/Framework.HttpClient/Framework.HttpClient.csproj
@@ -23,14 +23,14 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClient
Org.Eclipse.TractusX.Portal.Backend.Framework.HttpClient
- net6.0
+ net7.0
enable
enable
-
-
+
+
diff --git a/src/framework/Framework.IO/Framework.IO.csproj b/src/framework/Framework.IO/Framework.IO.csproj
index 3183ea75f0..0aa9b386a7 100644
--- a/src/framework/Framework.IO/Framework.IO.csproj
+++ b/src/framework/Framework.IO/Framework.IO.csproj
@@ -27,7 +27,7 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.IO
- net6.0
+ net7.0
enable
enable
diff --git a/src/framework/Framework.Linq/Framework.Linq.csproj b/src/framework/Framework.Linq/Framework.Linq.csproj
index 7e2e908783..da3a7d046a 100644
--- a/src/framework/Framework.Linq/Framework.Linq.csproj
+++ b/src/framework/Framework.Linq/Framework.Linq.csproj
@@ -27,7 +27,7 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.Linq
- net6.0
+ net7.0
enable
enable
diff --git a/src/framework/Framework.Logging/Framework.Logging.csproj b/src/framework/Framework.Logging/Framework.Logging.csproj
index b456ae0eea..ce1dea0d8d 100644
--- a/src/framework/Framework.Logging/Framework.Logging.csproj
+++ b/src/framework/Framework.Logging/Framework.Logging.csproj
@@ -23,19 +23,19 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.Logging
Org.Eclipse.TractusX.Portal.Backend.Framework.Logging
- net6.0
+ net7.0
enable
enable
-
-
+
+
-
-
+
+
diff --git a/src/framework/Framework.Models/Framework.Models.csproj b/src/framework/Framework.Models/Framework.Models.csproj
index 6eaed7115a..797bf3acf8 100644
--- a/src/framework/Framework.Models/Framework.Models.csproj
+++ b/src/framework/Framework.Models/Framework.Models.csproj
@@ -23,14 +23,14 @@
Org.Eclipse.TractusX.Portal.Backend.Framework.Models
Org.Eclipse.TractusX.Portal.Backend.Framework.Models
- net6.0
+ net7.0
enable
enable
-
-
+
+
diff --git a/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs b/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs
index e3aa7f9c2f..0894ed569c 100644
--- a/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs
+++ b/src/framework/Framework.Models/Validation/BaseOptionEnumerableValidation.cs
@@ -31,9 +31,9 @@ namespace Org.Eclipse.TractusX.Portal.Backend.Framework.Models.Validation;
public abstract class SharedBaseOptionEnumerableValidation
{
protected static readonly ImmutableArray IgnoreTypes = ImmutableArray.Create(
- typeof(String),
- typeof(Boolean),
- typeof(Decimal));
+ typeof(string),
+ typeof(bool),
+ typeof(decimal));
}
public abstract class BaseOptionEnumerableValidation : SharedBaseOptionEnumerableValidation, IValidateOptions where TOptions : class
@@ -73,7 +73,7 @@ public ValidateOptionsResult Validate(string? name, TOptions options)
return validationErrors.IfAny(
errors => errors.Select(r => $"DataAnnotation validation failed for members: '{string.Join(",", r.MemberNames)}' with the error: '{r.ErrorMessage}'."),
out var messages)
- ? ValidateOptionsResult.Fail(messages)
+ ? ValidateOptionsResult.Fail(messages!)
: ValidateOptionsResult.Success;
}
private IEnumerable GetValidationErrors(Type type, IConfiguration configSection) =>
diff --git a/src/framework/Framework.Models/Validation/DistinctValuesValidation.cs b/src/framework/Framework.Models/Validation/DistinctValuesValidation.cs
index b9707db87e..7e6531f233 100644
--- a/src/framework/Framework.Models/Validation/DistinctValuesValidation.cs
+++ b/src/framework/Framework.Models/Validation/DistinctValuesValidation.cs
@@ -57,7 +57,7 @@ protected override IEnumerable ValidateAttribute(IConfiguratio
throw new UnexpectedConditionException(
$"Attribute DistinctValues is applied to property {property.Name} which is not an IEnumerable type ({property.PropertyType})");
}
- var listValues = (IEnumerable)config.GetSection(propertyName).Get(property.PropertyType);
+ var listValues = config.GetSection(propertyName).Get(property.PropertyType) as IEnumerable;
var items = listValues?.ToIEnumerable();
IEnumerable