diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj
index 9d62e39e..cc6a7b03 100755
--- a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj
+++ b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Client.csproj
index abb6bd7d..61e38d91 100755
--- a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Client.csproj
+++ b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Client/Client.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj
index a7bdd2e8..2756a0cc 100755
--- a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj
+++ b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/IdentityServer/IdentityServer.csproj
@@ -7,8 +7,8 @@
-
+
-
+
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj
index 9d62e39e..cc6a7b03 100755
--- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj
+++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Api/Api.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj
index abb6bd7d..61e38d91 100755
--- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj
+++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/Client/Client.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/HostingExtensions.cs b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/HostingExtensions.cs
index 907ef3c8..62e55f55 100644
--- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/HostingExtensions.cs
+++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/HostingExtensions.cs
@@ -27,12 +27,12 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme;
options.SignOutScheme = IdentityServerConstants.SignoutScheme;
options.SaveTokens = true;
-
+
options.Authority = "https://demo.duendesoftware.com";
options.ClientId = "interactive.confidential";
options.ClientSecret = "secret";
options.ResponseType = "code";
-
+
options.TokenValidationParameters = new TokenValidationParameters
{
NameClaimType = "name",
@@ -51,10 +51,10 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
configureOptions: options =>
{
options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme;
-
+
options.ClientId = googleClientId;
options.ClientSecret = googleClientSecret;
-
+
options.CallbackPath = "/signin-google";
});
}
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj
index df544ea5..c51e0b93 100755
--- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj
+++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj
@@ -7,8 +7,8 @@
-
-
-
+
+
+
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
index b78329b8..776a23cf 100644
--- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
+++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
@@ -1,9 +1,9 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System.Buffers.Text;
using System.Text;
using System.Text.Json;
-using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
namespace IdentityServer.Pages.Diagnostics;
@@ -18,7 +18,7 @@ public ViewModel(AuthenticateResult result)
{
if (encoded != null)
{
- var bytes = Base64Url.Decode(encoded);
+ var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);
Clients = JsonSerializer.Deserialize(value) ?? Enumerable.Empty();
return;
diff --git a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj
index 9746f067..e3c55193 100644
--- a/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj
+++ b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj
index 9d62e39e..cc6a7b03 100755
--- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj
+++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Api/Api.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj
index abb6bd7d..61e38d91 100755
--- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj
+++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/Client/Client.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj
index df544ea5..c51e0b93 100755
--- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj
+++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/IdentityServer.csproj
@@ -7,8 +7,8 @@
-
-
-
+
+
+
diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
index b78329b8..776a23cf 100644
--- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
+++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
@@ -1,9 +1,9 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System.Buffers.Text;
using System.Text;
using System.Text.Json;
-using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
namespace IdentityServer.Pages.Diagnostics;
@@ -18,7 +18,7 @@ public ViewModel(AuthenticateResult result)
{
if (encoded != null)
{
- var bytes = Base64Url.Decode(encoded);
+ var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);
Clients = JsonSerializer.Deserialize(value) ?? Enumerable.Empty();
return;
diff --git a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj
index 9746f067..e3c55193 100644
--- a/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj
+++ b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj
index 9d62e39e..cc6a7b03 100644
--- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj
+++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Api/Api.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Client/Client.csproj
index abb6bd7d..61e38d91 100644
--- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Client/Client.csproj
+++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/Client/Client.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj
index df544ea5..c51e0b93 100644
--- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj
+++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/IdentityServer.csproj
@@ -7,8 +7,8 @@
-
-
-
+
+
+
diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
index b78329b8..776a23cf 100644
--- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
+++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
@@ -1,9 +1,9 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System.Buffers.Text;
using System.Text;
using System.Text.Json;
-using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
namespace IdentityServer.Pages.Diagnostics;
@@ -18,7 +18,7 @@ public ViewModel(AuthenticateResult result)
{
if (encoded != null)
{
- var bytes = Base64Url.Decode(encoded);
+ var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);
Clients = JsonSerializer.Deserialize(value) ?? Enumerable.Empty();
return;
diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/Program.cs b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/Program.cs
index c095f5e6..dd4f3046 100644
--- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/Program.cs
+++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/Program.cs
@@ -1,6 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using Duende.AccessTokenManagement.OpenIdConnect;
using Microsoft.AspNetCore.Authentication;
var builder = WebApplication.CreateBuilder(args);
diff --git a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj
index 050e5b24..8b72cf11 100644
--- a/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj
+++ b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj
index 9d62e39e..cc6a7b03 100755
--- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj
+++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Api/Api.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Client/Client.csproj
index abb6bd7d..61e38d91 100755
--- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Client/Client.csproj
+++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/Client/Client.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj
index f003901a..e37ec5a5 100755
--- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj
+++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/IdentityServer.csproj
@@ -7,13 +7,13 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
+
+
diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
index b78329b8..776a23cf 100644
--- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
+++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/Pages/Diagnostics/ViewModel.cs
@@ -1,9 +1,9 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System.Buffers.Text;
using System.Text;
using System.Text.Json;
-using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
namespace IdentityServer.Pages.Diagnostics;
@@ -18,7 +18,7 @@ public ViewModel(AuthenticateResult result)
{
if (encoded != null)
{
- var bytes = Base64Url.Decode(encoded);
+ var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);
Clients = JsonSerializer.Deserialize(value) ?? Enumerable.Empty();
return;
diff --git a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj
index 9746f067..e3c55193 100644
--- a/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj
+++ b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj
index 9d62e39e..cc6a7b03 100755
--- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj
+++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Api/Api.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Client/Client.csproj
index abb6bd7d..61e38d91 100755
--- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Client/Client.csproj
+++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/Client/Client.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj
index 8076b0f4..039c486a 100644
--- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj
+++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj
@@ -7,13 +7,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs
index 021fe60a..097b01bf 100644
--- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs
+++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/Pages/Diagnostics/ViewModel.cs
@@ -1,9 +1,9 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.
+using System.Buffers.Text;
using System.Text;
using System.Text.Json;
-using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
namespace IdentityServerAspNetIdentity.Pages.Diagnostics;
@@ -18,7 +18,7 @@ public ViewModel(AuthenticateResult result)
{
if (encoded != null)
{
- var bytes = Base64Url.Decode(encoded);
+ var bytes = Base64Url.DecodeFromChars(encoded);
var value = Encoding.UTF8.GetString(bytes);
Clients = JsonSerializer.Deserialize(value) ?? Enumerable.Empty();
return;
diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj
index 9746f067..e3c55193 100644
--- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj
+++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj
@@ -7,7 +7,7 @@
-
+