From cbd4e5f5316926a7986d7212abe6c913e22cedf2 Mon Sep 17 00:00:00 2001 From: damienbod Date: Sun, 7 Dec 2025 09:26:01 +0100 Subject: [PATCH 1/7] Update to .NET 10 --- Bff.AppHost/Bff.AppHost.csproj | 2 +- Bff.ServiceDefaults/Bff.ServiceDefaults.csproj | 2 +- server/BffMicrosoftEntraID.Server.csproj | 2 +- tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bff.AppHost/Bff.AppHost.csproj b/Bff.AppHost/Bff.AppHost.csproj index 01f7dea..a4214c4 100644 --- a/Bff.AppHost/Bff.AppHost.csproj +++ b/Bff.AppHost/Bff.AppHost.csproj @@ -4,7 +4,7 @@ Exe - net9.0 + net10.0 enable enable 21eb7955-7bad-4d34-a0d8-b7508437294b diff --git a/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj b/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj index 233173d..123108b 100644 --- a/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj +++ b/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable true diff --git a/server/BffMicrosoftEntraID.Server.csproj b/server/BffMicrosoftEntraID.Server.csproj index 61ac47e..e6b1490 100644 --- a/server/BffMicrosoftEntraID.Server.csproj +++ b/server/BffMicrosoftEntraID.Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable 3e0420a7-5c54-4b9b-9c9c-e51013e5f99b diff --git a/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj b/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj index e9a31e5..630d045 100644 --- a/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj +++ b/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable false From 44879549033e6e69d0cc9871503a111bb6836d0e Mon Sep 17 00:00:00 2001 From: damienbod Date: Sun, 7 Dec 2025 09:27:26 +0100 Subject: [PATCH 2/7] Update to .NET 10 --- Bff.AppHost/Bff.AppHost.csproj | 2 +- Bff.ServiceDefaults/Bff.ServiceDefaults.csproj | 14 +++++++------- server/BffMicrosoftEntraID.Server.csproj | 16 ++++++++-------- ...crosoftEntraID.Server.IntegrationTests.csproj | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Bff.AppHost/Bff.AppHost.csproj b/Bff.AppHost/Bff.AppHost.csproj index a4214c4..1e9ab5b 100644 --- a/Bff.AppHost/Bff.AppHost.csproj +++ b/Bff.AppHost/Bff.AppHost.csproj @@ -11,7 +11,7 @@ - + diff --git a/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj b/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj index 123108b..1aa2ba9 100644 --- a/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj +++ b/Bff.ServiceDefaults/Bff.ServiceDefaults.csproj @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/server/BffMicrosoftEntraID.Server.csproj b/server/BffMicrosoftEntraID.Server.csproj index e6b1490..3af5691 100644 --- a/server/BffMicrosoftEntraID.Server.csproj +++ b/server/BffMicrosoftEntraID.Server.csproj @@ -21,14 +21,14 @@ - - - - - - - - + + + + + + + + diff --git a/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj b/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj index 630d045..6afb561 100644 --- a/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj +++ b/tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj @@ -12,8 +12,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all From a165c57237523fa26adc2535c541b34c44a3e07e Mon Sep 17 00:00:00 2001 From: damienbod Date: Sun, 7 Dec 2025 09:28:45 +0100 Subject: [PATCH 3/7] Update .NET 10 --- .github/workflows/deploy-to-azure.yml | 2 +- .github/workflows/dotnet-and-npm-build.yml | 2 +- Bff.sln | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-to-azure.yml b/.github/workflows/deploy-to-azure.yml index 6735c6a..f2ef303 100644 --- a/.github/workflows/deploy-to-azure.yml +++ b/.github/workflows/deploy-to-azure.yml @@ -16,7 +16,7 @@ permissions: env: AZURE_WEBAPP_NAME: e2e-security-web-appsrv-dev # set this to the name of your Azure App Service AZURE_WEBAPP_PACKAGE_PATH: "." - DOTNET_VERSION: "9.0.x" # set this to the .NET Core version to use + DOTNET_VERSION: "10.0.x" # set this to the .NET Core version to use TERRAFORM_ROOT_DIRECTORY: "./iac" TERRAFORM_VERSION: "1.13.3" diff --git a/.github/workflows/dotnet-and-npm-build.yml b/.github/workflows/dotnet-and-npm-build.yml index 52a68c8..5dbe112 100644 --- a/.github/workflows/dotnet-and-npm-build.yml +++ b/.github/workflows/dotnet-and-npm-build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: dotnet restore diff --git a/Bff.sln b/Bff.sln index 850261d..3c289ac 100644 --- a/Bff.sln +++ b/Bff.sln @@ -1,15 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.0.11123.170 d18.0 +VisualStudioVersion = 18.0.11123.170 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BffMicrosoftEntraID.Server", "server\BffMicrosoftEntraID.Server.csproj", "{586272BB-19BC-4BAB-976F-5DC1E778257E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9D8FB767-F7A7-4A5B-A4E9-DC6DB6BCD941}" ProjectSection(SolutionItems) = preProject - .github\workflows\dotnet.yml = .github\workflows\dotnet.yml + .github\workflows\deploy-to-azure.yml = .github\workflows\deploy-to-azure.yml + .github\workflows\dotnet-and-npm-build.yml = .github\workflows\dotnet-and-npm-build.yml + .github\workflows\quality.yml = .github\workflows\quality.yml README.md = README.md - .github\workflows\sonarbuild.yml = .github\workflows\sonarbuild.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BffMicrosoftEntraID.Server.IntegrationTests", "tests\BffMicrosoftEntraID.Server.IntegrationTests.csproj", "{4E6C76A4-2BB3-4F8F-B9EF-E0D343D4FD29}" From 138ad07d4f1cf19d712560ff6263c9482b9b1af2 Mon Sep 17 00:00:00 2001 From: damienbod Date: Sun, 7 Dec 2025 09:38:05 +0100 Subject: [PATCH 4/7] Fix .NET 10 exception with empty arrays --- server/appsettings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/appsettings.json b/server/appsettings.json index 907d331..b6376f4 100644 --- a/server/appsettings.json +++ b/server/appsettings.json @@ -5,8 +5,7 @@ "TenantId": "[Enter 'common', or 'organizations' or the Tenant Id ('Directory (tenant) ID' obtained from the Azure portal (Overview of the corresponding App Registration)), e.g. da41245a5-11b3-996c-00a8-4d99re19f292]", "ClientId": "[Enter the Client Id ('Application (client) ID' obtained from the Azure portal), e.g. ba74781c2-53c2-442a-97c2-3d60re42f403]", "ClientSecret": "[Copy the client secret added to the App Registration from the Azure portal]", - "ClientCertificates": [ - ], + //"ClientCertificates": [], // Note: emtpy array can cause exceptions // the following is required to handle Continuous Access Evaluation challenges "ClientCapabilities": [ "cp1" ], "CallbackPath": "/signin-oidc" From b881e693971d9c9221e3d44e646e6f295dcedb7b Mon Sep 17 00:00:00 2001 From: damienbod Date: Sun, 7 Dec 2025 10:06:02 +0100 Subject: [PATCH 5/7] .NET 10 --- iac/main-appsrv.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac/main-appsrv.tf b/iac/main-appsrv.tf index 6e3ca51..1ec5bd9 100644 --- a/iac/main-appsrv.tf +++ b/iac/main-appsrv.tf @@ -16,7 +16,7 @@ resource "azurerm_linux_web_app" "appsrv" { https_only = true site_config { application_stack { - dotnet_version = "9.0" + dotnet_version = "10.0" } http2_enabled = true always_on = false From 11c15119487ef3a86fa54dd5383cb3786d8a28a5 Mon Sep 17 00:00:00 2001 From: Marc Rufer Date: Sun, 7 Dec 2025 12:09:57 +0100 Subject: [PATCH 6/7] Update azurerm version to 4.55.0 --- iac/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac/versions.tf b/iac/versions.tf index 8aed825..ce539f5 100644 --- a/iac/versions.tf +++ b/iac/versions.tf @@ -11,7 +11,7 @@ terraform { } azurerm = { source = "hashicorp/azurerm" - version = "~> 4.49.0" + version = "~> 4.55.0" } random = { source = "hashicorp/random" From dfb2894116bebb3b3f99522c4ef9a8ac3dc8945c Mon Sep 17 00:00:00 2001 From: Marc Rufer Date: Sun, 7 Dec 2025 12:14:04 +0100 Subject: [PATCH 7/7] Update Bff.AppHost.csproj --- Bff.AppHost/Bff.AppHost.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Bff.AppHost/Bff.AppHost.csproj b/Bff.AppHost/Bff.AppHost.csproj index 1e9ab5b..6ad6aa7 100644 --- a/Bff.AppHost/Bff.AppHost.csproj +++ b/Bff.AppHost/Bff.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -11,7 +9,6 @@ -