Skip to content

Update .NET 10 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rufer7 merged 7 commits into from
Dec 7, 2025
Merged

Update .NET 10 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbd4e5f
Update to .NET 10
damienbod Dec 7, 2025
4487954
Update to .NET 10
damienbod Dec 7, 2025
a165c57
Update .NET 10
damienbod Dec 7, 2025
138ad07
Fix .NET 10 exception with empty arrays
damienbod Dec 7, 2025
b881e69
.NET 10
damienbod Dec 7, 2025
11c1511
Update azurerm version to 4.55.0
rufer7 Dec 7, 2025
dfb2894
Update Bff.AppHost.csproj
rufer7 Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-and-npm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions Bff.AppHost/Bff.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>21eb7955-7bad-4d34-a0d8-b7508437294b</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.2" />
<PackageReference Include="Aspire.Hosting.NodeJs" Version="9.5.2" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions Bff.ServiceDefaults/Bff.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand All @@ -10,13 +10,13 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.2" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
</ItemGroup>

</Project>
7 changes: 4 additions & 3 deletions Bff.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion iac/main-appsrv.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion iac/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ terraform {
}
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.49.0"
version = "~> 4.55.0"
}
random = {
source = "hashicorp/random"
Expand Down
18 changes: 9 additions & 9 deletions server/BffMicrosoftEntraID.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>3e0420a7-5c54-4b9b-9c9c-e51013e5f99b</UserSecretsId>
Expand All @@ -21,14 +21,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.10" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="4.0.1" />
<PackageReference Include="Microsoft.Identity.Web" Version="4.0.1" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="4.0.1" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.2.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="4.1.1" />
<PackageReference Include="Microsoft.Identity.Web" Version="4.1.1" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="4.1.1" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.3.0" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions server/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand All @@ -12,8 +12,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
Expand Down