diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ef763fe..65c2484 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0' + dotnet-version: '10.0' include-prerelease: True - name: Restore dependencies run: dotnet restore diff --git a/AspNetCoreRazor/AspNetCoreRazor.csproj b/AspNetCoreRazor/AspNetCoreRazor.csproj index 8945a9d..cec351e 100644 --- a/AspNetCoreRazor/AspNetCoreRazor.csproj +++ b/AspNetCoreRazor/AspNetCoreRazor.csproj @@ -1,19 +1,19 @@  - net9.0 + net10.0 aspnet-AspNetCoreRazor-7E2EEDC5-9D3D-4F7E-AE3C-7F4637E7323C enable enable - - - - - - + + + + + + diff --git a/AspNetCoreRazorMultiClients/AspNetCoreRazorMultiClients.csproj b/AspNetCoreRazorMultiClients/AspNetCoreRazorMultiClients.csproj index 765d3a1..23c700e 100644 --- a/AspNetCoreRazorMultiClients/AspNetCoreRazorMultiClients.csproj +++ b/AspNetCoreRazorMultiClients/AspNetCoreRazorMultiClients.csproj @@ -1,19 +1,18 @@  - net9.0 + net10.0 aspnet-AspNetCoreRazorMultiClients-7E2EEDC5-9D3D-4F7E-AE3C-7F4637E7323C enable enable - - - - - - + + + + + diff --git a/AspNetCoreRazorMultiClients/Properties/launchSettings.json b/AspNetCoreRazorMultiClients/Properties/launchSettings.json index 296a417..161154e 100644 --- a/AspNetCoreRazorMultiClients/Properties/launchSettings.json +++ b/AspNetCoreRazorMultiClients/Properties/launchSettings.json @@ -1,25 +1,10 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "https://localhost:44348", - "sslPort": 44348 - } - }, "profiles": { "AspNetCoreRazorMultiClients": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, + "applicationUrl": "https://localhost:5001", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/BlazorBffAzureAD/Client/BlazorHosted.Client.csproj b/BlazorBffAzureAD/Client/BlazorHosted.Client.csproj index 8efe7b5..78593b3 100644 --- a/BlazorBffAzureAD/Client/BlazorHosted.Client.csproj +++ b/BlazorBffAzureAD/Client/BlazorHosted.Client.csproj @@ -1,17 +1,17 @@  - net9.0 + net10.0 true enable enable - - - - + + + + diff --git a/BlazorBffAzureAD/Server/BlazorHosted.Server.csproj b/BlazorBffAzureAD/Server/BlazorHosted.Server.csproj index 64f9843..5e31d68 100644 --- a/BlazorBffAzureAD/Server/BlazorHosted.Server.csproj +++ b/BlazorBffAzureAD/Server/BlazorHosted.Server.csproj @@ -1,15 +1,15 @@  - net9.0 + net10.0 BlazorHosted.Server-394C3C10-DE35-4EAA-BE0A-66A906534BEF enable enable - - + + @@ -18,11 +18,11 @@ - - - - - + + + + + diff --git a/BlazorBffAzureAD/Shared/BlazorHosted.Shared.csproj b/BlazorBffAzureAD/Shared/BlazorHosted.Shared.csproj index 51273b4..f7d959f 100644 --- a/BlazorBffAzureAD/Shared/BlazorHosted.Shared.csproj +++ b/BlazorBffAzureAD/Shared/BlazorHosted.Shared.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable diff --git a/BlazorBffAzureADWithApi/Client/BlazorBffAzureADWithApi.Client.csproj b/BlazorBffAzureADWithApi/Client/BlazorBffAzureADWithApi.Client.csproj index 754e27e..abbc925 100644 --- a/BlazorBffAzureADWithApi/Client/BlazorBffAzureADWithApi.Client.csproj +++ b/BlazorBffAzureADWithApi/Client/BlazorBffAzureADWithApi.Client.csproj @@ -1,17 +1,17 @@  - net9.0 + net10.0 true enable enable - - - - + + + + diff --git a/BlazorBffAzureADWithApi/Server/BlazorBffAzureADWithApi.Server.csproj b/BlazorBffAzureADWithApi/Server/BlazorBffAzureADWithApi.Server.csproj index b423a76..220987c 100644 --- a/BlazorBffAzureADWithApi/Server/BlazorBffAzureADWithApi.Server.csproj +++ b/BlazorBffAzureADWithApi/Server/BlazorBffAzureADWithApi.Server.csproj @@ -1,15 +1,15 @@  - net9.0 + net10.0 3577fff2-944d-4277-b7e0-212116b606be enable enable - - + + @@ -18,14 +18,14 @@ - - - - - - - - + + + + + + + + diff --git a/BlazorBffAzureADWithApi/Server/Program.cs b/BlazorBffAzureADWithApi/Server/Program.cs index a46d42c..c3b22d0 100644 --- a/BlazorBffAzureADWithApi/Server/Program.cs +++ b/BlazorBffAzureADWithApi/Server/Program.cs @@ -7,7 +7,7 @@ using Microsoft.Identity.Web; using Microsoft.Identity.Web.UI; using Microsoft.IdentityModel.Logging; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using NetEscapades.AspNetCore.SecurityHeaders.Infrastructure; var builder = WebApplication.CreateBuilder(args); @@ -73,40 +73,6 @@ //options.Filters.Add(new AuthorizeFilter(policy)); }).AddMicrosoftIdentityUI(); -services.AddSwaggerGen(c => -{ - c.EnableAnnotations(); - - // add JWT Authentication - var securityScheme = new OpenApiSecurityScheme - { - Name = "JWT Authentication", - Description = "Enter JWT Bearer token **_only_**", - In = ParameterLocation.Header, - Type = SecuritySchemeType.Http, - Scheme = "bearer", // must be lower case - BearerFormat = "JWT", - Reference = new OpenApiReference - { - Id = JwtBearerDefaults.AuthenticationScheme, - Type = ReferenceType.SecurityScheme - } - }; - c.AddSecurityDefinition(securityScheme.Reference.Id, securityScheme); - c.AddSecurityRequirement(new OpenApiSecurityRequirement - { - {securityScheme, Array.Empty() } - }); - c.SwaggerDoc("v1", new OpenApiInfo - { - Title = "My API", - Version = "v1", - Description = "My API" - }); - -}); - - var app = builder.Build(); IdentityModelEventSource.ShowPII = true; @@ -123,12 +89,6 @@ app.UseSecurityHeaders(); -app.UseSwagger(); -app.UseSwaggerUI(c => -{ - c.SwaggerEndpoint("/swagger/v1/swagger.json", "MyApi v1"); -}); - app.UseHttpsRedirection(); app.UseBlazorFrameworkFiles(); app.UseStaticFiles(); diff --git a/BlazorBffAzureADWithApi/Shared/BlazorBffAzureADWithApi.Shared.csproj b/BlazorBffAzureADWithApi/Shared/BlazorBffAzureADWithApi.Shared.csproj index 51273b4..f7d959f 100644 --- a/BlazorBffAzureADWithApi/Shared/BlazorBffAzureADWithApi.Shared.csproj +++ b/BlazorBffAzureADWithApi/Shared/BlazorBffAzureADWithApi.Shared.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable diff --git a/BlazorBffAzureADWithApi/UITestClientForApiTest/UITestClientForApiTest.csproj b/BlazorBffAzureADWithApi/UITestClientForApiTest/UITestClientForApiTest.csproj index d41405b..f057b95 100644 --- a/BlazorBffAzureADWithApi/UITestClientForApiTest/UITestClientForApiTest.csproj +++ b/BlazorBffAzureADWithApi/UITestClientForApiTest/UITestClientForApiTest.csproj @@ -2,13 +2,13 @@ BD4BD465-71CA-4729-B416-877E627206D8 - net9.0 + net10.0 1579346f-16df-4b37-a087-39df6bf2ffae - - + + diff --git a/README.md b/README.md index 9db2d9d..0969327 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Razor page application secured using Microsoft Entra ID ## History +- 2026-01-13 .NET 10 - 2025-05-07 Updated packages, - 2024-11-15 .NET 9 - 2024-10-19 Updated packages, improved security headers