Skip to content

Commit af95e0c

Browse files
rufer7rufer7
authored
Merge pull request #15 from secure-web-apps/feature/net10
Update .NET 10
2 parents 1503672 + dfb2894 commit af95e0c

10 files changed

Lines changed: 31 additions & 34 deletions

‎.github/workflows/deploy-to-azure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
env:
1717
AZURE_WEBAPP_NAME: e2e-security-web-appsrv-dev # set this to the name of your Azure App Service
1818
AZURE_WEBAPP_PACKAGE_PATH: "."
19-
DOTNET_VERSION: "9.0.x" # set this to the .NET Core version to use
19+
DOTNET_VERSION: "10.0.x" # set this to the .NET Core version to use
2020
TERRAFORM_ROOT_DIRECTORY: "./iac"
2121
TERRAFORM_VERSION: "1.13.3"
2222

‎.github/workflows/dotnet-and-npm-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v5
1818
with:
19-
dotnet-version: 9.0.x
19+
dotnet-version: 10.0.x
2020

2121
- name: Restore dependencies
2222
run: dotnet restore

‎Bff.AppHost/Bff.AppHost.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
1+
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">
42

53
<PropertyGroup>
64
<OutputType>Exe</OutputType>
7-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
86
<ImplicitUsings>enable</ImplicitUsings>
97
<Nullable>enable</Nullable>
108
<UserSecretsId>21eb7955-7bad-4d34-a0d8-b7508437294b</UserSecretsId>
119
</PropertyGroup>
1210

1311
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.2" />
1512
<PackageReference Include="Aspire.Hosting.NodeJs" Version="9.5.2" />
1613
</ItemGroup>
1714

‎Bff.ServiceDefaults/Bff.ServiceDefaults.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAspireSharedProject>true</IsAspireSharedProject>
@@ -10,13 +10,13 @@
1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

13-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.2" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
13+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
2020
</ItemGroup>
2121

2222
</Project>

‎Bff.sln‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 18
4-
VisualStudioVersion = 18.0.11123.170 d18.0
4+
VisualStudioVersion = 18.0.11123.170
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BffMicrosoftEntraID.Server", "server\BffMicrosoftEntraID.Server.csproj", "{586272BB-19BC-4BAB-976F-5DC1E778257E}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9D8FB767-F7A7-4A5B-A4E9-DC6DB6BCD941}"
99
ProjectSection(SolutionItems) = preProject
10-
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
10+
.github\workflows\deploy-to-azure.yml = .github\workflows\deploy-to-azure.yml
11+
.github\workflows\dotnet-and-npm-build.yml = .github\workflows\dotnet-and-npm-build.yml
12+
.github\workflows\quality.yml = .github\workflows\quality.yml
1113
README.md = README.md
12-
.github\workflows\sonarbuild.yml = .github\workflows\sonarbuild.yml
1314
EndProjectSection
1415
EndProject
1516
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BffMicrosoftEntraID.Server.IntegrationTests", "tests\BffMicrosoftEntraID.Server.IntegrationTests.csproj", "{4E6C76A4-2BB3-4F8F-B9EF-E0D343D4FD29}"

‎iac/main-appsrv.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "azurerm_linux_web_app" "appsrv" {
1616
https_only = true
1717
site_config {
1818
application_stack {
19-
dotnet_version = "9.0"
19+
dotnet_version = "10.0"
2020
}
2121
http2_enabled = true
2222
always_on = false

‎iac/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ terraform {
1111
}
1212
azurerm = {
1313
source = "hashicorp/azurerm"
14-
version = "~> 4.49.0"
14+
version = "~> 4.55.0"
1515
}
1616
random = {
1717
source = "hashicorp/random"

‎server/BffMicrosoftEntraID.Server.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>3e0420a7-5c54-4b9b-9c9c-e51013e5f99b</UserSecretsId>
@@ -21,14 +21,14 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" NoWarn="NU1605" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.10" />
26-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
27-
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="4.0.1" />
28-
<PackageReference Include="Microsoft.Identity.Web" Version="4.0.1" />
29-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="4.0.1" />
30-
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.2.0" />
31-
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.2.0" />
24+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" NoWarn="NU1605" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0" />
26+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
27+
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="4.1.1" />
28+
<PackageReference Include="Microsoft.Identity.Web" Version="4.1.1" />
29+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="4.1.1" />
30+
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
31+
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />
3232
<PackageReference Include="Yarp.ReverseProxy" Version="2.3.0" />
3333
</ItemGroup>
3434

‎server/appsettings.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"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]",
66
"ClientId": "[Enter the Client Id ('Application (client) ID' obtained from the Azure portal), e.g. ba74781c2-53c2-442a-97c2-3d60re42f403]",
77
"ClientSecret": "[Copy the client secret added to the App Registration from the Azure portal]",
8-
"ClientCertificates": [
9-
],
8+
//"ClientCertificates": [], // Note: emtpy array can cause exceptions
109
// the following is required to handle Continuous Access Evaluation challenges
1110
"ClientCapabilities": [ "cp1" ],
1211
"CallbackPath": "/signin-oidc"

‎tests/BffMicrosoftEntraID.Server.IntegrationTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -12,8 +12,8 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1717
<PackageReference Include="xunit" Version="2.9.3" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1919
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)