diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7bb78e9..d543bca 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.x' + dotnet-version: '10.0.x' include-prerelease: True - name: Restore dependencies run: dotnet restore diff --git a/AspNetCoreBackChannelLogout.sln b/AspNetCoreBackChannelLogout.sln index 5fe0d87..14fab3c 100644 --- a/AspNetCoreBackChannelLogout.sln +++ b/AspNetCoreBackChannelLogout.sln @@ -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 @@ -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 @@ -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 diff --git a/ConsoleStandaloneUsingAzureSecrets/ConsoleStandaloneUsingAzureSecrets.csproj b/ConsoleStandaloneUsingAzureSecrets/ConsoleStandaloneUsingAzureSecrets.csproj index 3d04383..3af2c3b 100644 --- a/ConsoleStandaloneUsingAzureSecrets/ConsoleStandaloneUsingAzureSecrets.csproj +++ b/ConsoleStandaloneUsingAzureSecrets/ConsoleStandaloneUsingAzureSecrets.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 49111a46-3c30-43e7-947e-3089451b73f2 @@ -12,7 +12,7 @@ - + diff --git a/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/MvcHybridBackChannel/MvcHybridBackChannel.csproj index 672c149..472302e 100644 --- a/MvcHybridBackChannel/MvcHybridBackChannel.csproj +++ b/MvcHybridBackChannel/MvcHybridBackChannel.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 76d39374-e426-49ca-a223-d8e94b698012 enable true @@ -13,19 +13,19 @@ - - - - + + + + - + - + - + diff --git a/MvcHybridBackChannelTwo/MvcHybridBackChannelTwo.csproj b/MvcHybridBackChannelTwo/MvcHybridBackChannelTwo.csproj index e956e5c..e8f9794 100644 --- a/MvcHybridBackChannelTwo/MvcHybridBackChannelTwo.csproj +++ b/MvcHybridBackChannelTwo/MvcHybridBackChannelTwo.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 73cb39c8-1e7a-4b64-83f1-2409645fdcc3 enable true @@ -13,19 +13,19 @@ - - - - + + + + - + - + - + diff --git a/README.md b/README.md index 6d332f0..d505c27 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/StsServerIdentity/Pages/Diagnostics/ViewModel.cs b/StsServerIdentity/Pages/Diagnostics/ViewModel.cs index e3b3a15..a026bba 100644 --- a/StsServerIdentity/Pages/Diagnostics/ViewModel.cs +++ b/StsServerIdentity/Pages/Diagnostics/ViewModel.cs @@ -3,6 +3,7 @@ using Duende.IdentityModel; using Microsoft.AspNetCore.Authentication; +using System.Buffers.Text; using System.Text; using System.Text.Json; @@ -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(value); diff --git a/StsServerIdentity/StsServerIdentity.csproj b/StsServerIdentity/StsServerIdentity.csproj index 54f64ec..85720d3 100644 --- a/StsServerIdentity/StsServerIdentity.csproj +++ b/StsServerIdentity/StsServerIdentity.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable 55674afb-fac9-407f-898f-6a543e9d137a @@ -11,22 +11,21 @@ - + - - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + \ No newline at end of file