Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'
include-prerelease: True
- name: Restore dependencies
run: dotnet restore
Expand Down
10 changes: 2 additions & 8 deletions AspNetCoreBackChannelLogout.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.10.35201.131
# Visual Studio Version 18
VisualStudioVersion = 18.0.11222.15 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StsServerIdentity", "StsServerIdentity\StsServerIdentity.csproj", "{62786040-0228-438F-B186-6EE2B02903E6}"
EndProject
Expand All @@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
Project("{151D2E53-A2C4-4D7D-83FE-D05416EBD58E}") = "AzureResourceGroupMvcHybridBackChannel", "AzureResourceGroupMvcHybridBackChannel\AzureResourceGroupMvcHybridBackChannel.deployproj", "{DED60CCB-4C2B-4B8B-96ED-CF722E029E3B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleStandaloneUsingAzureSecrets", "ConsoleStandaloneUsingAzureSecrets\ConsoleStandaloneUsingAzureSecrets.csproj", "{3142A077-E12B-4A6B-A98E-09F99ACFC788}"
EndProject
Global
Expand All @@ -37,10 +35,6 @@ Global
{5920113D-C5A5-41D2-9363-F998FFE6B830}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5920113D-C5A5-41D2-9363-F998FFE6B830}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5920113D-C5A5-41D2-9363-F998FFE6B830}.Release|Any CPU.Build.0 = Release|Any CPU
{DED60CCB-4C2B-4B8B-96ED-CF722E029E3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DED60CCB-4C2B-4B8B-96ED-CF722E029E3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DED60CCB-4C2B-4B8B-96ED-CF722E029E3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DED60CCB-4C2B-4B8B-96ED-CF722E029E3B}.Release|Any CPU.Build.0 = Release|Any CPU
{3142A077-E12B-4A6B-A98E-09F99ACFC788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3142A077-E12B-4A6B-A98E-09F99ACFC788}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3142A077-E12B-4A6B-A98E-09F99ACFC788}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<UserSecretsId>49111a46-3c30-43e7-947e-3089451b73f2</UserSecretsId>
</PropertyGroup>

Expand All @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="Azure.Identity" Version="1.17.1" />
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.8.0" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions MvcHybridBackChannel/MvcHybridBackChannel.csproj
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>
<UserSecretsId>76d39374-e426-49ca-a223-d8e94b698012</UserSecretsId>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
Expand All @@ -13,19 +13,19 @@

<ItemGroup>
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.8" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.1.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />

<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="Azure.Identity" Version="1.17.1" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.AzureApp" Version="3.1.0" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions MvcHybridBackChannelTwo/MvcHybridBackChannelTwo.csproj
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>
<UserSecretsId>73cb39c8-1e7a-4b64-83f1-2409645fdcc3</UserSecretsId>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
Expand All @@ -13,19 +13,19 @@

<ItemGroup>
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.8" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.1.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />

<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="Azure.Identity" Version="1.17.1" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.AzureApp" Version="3.1.0" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dotnet ef database update -c PersistedGrantDbContext

## History

- 2025-12-08 Updated .NET 10
- 2025-09-01 Updated packages
- 2025-06-03 Updated .NET 9
- 2024-11-03 Updated packages
Expand Down
3 changes: 2 additions & 1 deletion StsServerIdentity/Pages/Diagnostics/ViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
using System.Buffers.Text;
using System.Text;
using System.Text.Json;

Expand All @@ -17,7 +18,7 @@ public ViewModel(AuthenticateResult result)
if (result.Properties.Items.ContainsKey("client_list"))
{
var encoded = result.Properties.Items["client_list"];
var bytes = Base64Url.Decode(encoded);
var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);

Clients = JsonSerializer.Deserialize<string[]>(value);
Expand Down
25 changes: 12 additions & 13 deletions StsServerIdentity/StsServerIdentity.csproj
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>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>55674afb-fac9-407f-898f-6a543e9d137a</UserSecretsId>
</PropertyGroup>
Expand All @@ -11,22 +11,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.3.1" />
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.4.2" />
<PackageReference Include="Fido2" Version="3.0.1" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.8" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.8">
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.1.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.1.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="1.3.0" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="1.3.0" />
</ItemGroup>
</Project>
Loading