From 0e9258d13eb7b248e8ba753097238f33a30aac06 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 9 Apr 2026 15:50:33 +0200 Subject: [PATCH] Introduce package management for IS v7 samples --- .../ResourceBasedApi/ResourceBasedApi.csproj | 6 +- .../v7/Apis/SimpleApi/SimpleApi.csproj | 4 +- .../v7/AspNetIdentity/Client/Client.csproj | 2 +- .../IdentityServerAspNetIdentity.csproj | 16 ++--- ...dentityServerAspNetIdentityPasskeys.csproj | 14 ++--- .../Aspire.ServiceDefaults.csproj | 14 ++--- .../ClientCredentials/src/Client.csproj | 2 +- .../v7/Basics/Introspection/src/Client.csproj | 2 +- .../src/Client.csproj | 4 +- .../src/Program.cs | 8 +-- .../MvcBackChannelLogout/src/Client.csproj | 4 +- .../v7/Basics/MvcBasic/src/Client.csproj | 4 +- .../src/AssertionConfigurationService.cs | 16 ++--- .../Basics/MvcJarJwt/src/AssertionService.cs | 25 +++----- .../v7/Basics/MvcJarJwt/src/Client.csproj | 4 +- .../v7/Basics/MvcJarJwt/src/Program.cs | 1 + .../v7/Basics/MvcPar/src/Client.csproj | 8 +-- .../v7/Basics/MvcPar/src/Program.cs | 1 + .../MvcTokenManagement/src/Client.csproj | 4 +- .../Basics/MvcTokenManagement/src/Program.cs | 1 + .../Basics/Shared/TokenResponseExtensions.cs | 5 +- .../IdentityServerHost/IdentityServer.csproj | 10 +-- .../Configuration/Configuration.csproj | 8 +-- .../ConsoleDcrClient/ConsoleDcrClient.csproj | 2 +- .../Configuration/Configuration.csproj | 10 +-- .../ConsoleDcrClient/ConsoleDcrClient.csproj | 8 +-- .../Configuration/Configuration.csproj | 8 +-- .../ConsoleDcrClient/ConsoleDcrClient.csproj | 2 +- .../Configuration/Configuration.csproj | 8 +-- .../ConsoleDcrClient/ConsoleDcrClient.csproj | 4 +- IdentityServer/v7/DPoP/Api/Api.csproj | 6 +- IdentityServer/v7/DPoP/Api/Program.cs | 7 +++ .../ClientCredentials.csproj | 6 +- .../v7/DPoP/WebClient/WebClient.csproj | 8 +-- .../Aspire.ApiService.csproj | 2 +- .../Aspire.AppHost/Aspire.AppHost.csproj | 4 +- .../Aspire.ServiceDefaults.csproj | 16 ++--- .../Aspire/Aspire.Web/Aspire.Web.csproj | 4 +- .../IdentityServer/IdentityServer.csproj | 4 +- .../v7/Diagnostics/Otel/src/Otel.csproj | 18 +++--- IdentityServer/v7/Directory.Packages.props | 61 +++++++++++++++++++ .../src/IdentityServerHost.csproj | 4 +- IdentityServer/v7/MTLS/Api/Api.csproj | 4 +- .../ClientCredentials.csproj | 2 +- .../IdentityServerHost.csproj | 6 +- .../McpDemo.Client/McpDemo.Client.csproj | 4 +- .../McpDemo.IdentityServer.csproj | 6 +- .../McpDemo.McpServer.csproj | 4 +- .../v7/McpDemo/McpDemo.McpServer/Program.cs | 6 +- IdentityServer/v7/PAT/Api/Api.csproj | 6 +- IdentityServer/v7/PAT/Client/Client.csproj | 2 +- .../IdentityServerHost.csproj | 4 +- .../1_ClientCredentials/src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 4 +- .../src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 6 +- .../src/WebClient/WebClient.csproj | 2 +- .../3_AspNetCoreAndApis/src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 6 +- .../src/WebClient/WebClient.csproj | 2 +- .../3a_TokenManagement/src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 6 +- .../src/WebClient/WebClient.csproj | 4 +- .../4_EntityFramework/src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 10 +-- .../src/WebClient/WebClient.csproj | 2 +- .../5_AspNetIdentity/src/Api/Api.csproj | 2 +- .../5_AspNetIdentity/src/Client/Client.csproj | 2 +- .../IdentityServerAspNetIdentity.csproj | 16 ++--- .../src/WebClient/WebClient.csproj | 2 +- .../6_JS_with_backend/src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 6 +- .../JavaScriptClient/JavaScriptClient.csproj | 8 +-- .../src/WebClient/WebClient.csproj | 2 +- .../6_JS_without_backend/src/Api/Api.csproj | 2 +- .../src/Client/Client.csproj | 2 +- .../src/IdentityServer/IdentityServer.csproj | 6 +- .../src/WebClient/WebClient.csproj | 2 +- .../v7/Quickstarts/7_Blazor/BFF/BFF.csproj | 4 +- .../7_Blazor/BlazorWasm/BlazorWasm.csproj | 10 +-- .../ScopesAndResources/Client/Client.csproj | 2 +- .../IdentityServerHost.csproj | 4 +- .../v7/SessionManagement/Client/Client.csproj | 4 +- .../IdentityServerHost.csproj | 2 +- .../SessionManagement.AppHost.csproj | 3 +- .../SessionMigration/SessionMigration.csproj | 6 +- .../v7/TokenExchange/Client/Client.csproj | 2 +- .../IdentityServerHost.csproj | 2 +- .../TokenExchange.AppHost.csproj | 3 +- .../UserInteraction/Ciba/Client/Client.csproj | 2 +- .../IdentityServer.AppHost.csproj | 4 +- .../IdentityServerHost.csproj | 2 +- .../DynamicProviders/Client/Client.csproj | 4 +- .../IdentityServerHost.csproj | 12 ++-- .../ProfileService/Api/Api.csproj | 4 +- .../ProfileService/Client/Client.csproj | 4 +- .../IdentityServerHost.csproj | 4 +- .../SpaLoginUi/Client/Client.csproj | 4 +- .../IdentityServerHost.csproj | 4 +- .../v7/UserInteraction/StepUp/Api/Api.csproj | 6 +- .../StepUp/Client/Client.csproj | 6 +- .../IdentityServerHost.csproj | 4 +- .../Client/Client.csproj | 4 +- .../IdentityServerHost.csproj | 4 +- .../Client/Client.csproj | 4 +- .../IdentityServerHost.csproj | 12 ++-- samples.slnx | 3 + 113 files changed, 351 insertions(+), 283 deletions(-) create mode 100644 IdentityServer/v7/Directory.Packages.props diff --git a/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj b/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj index 5bcf7096..b7129bc3 100755 --- a/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj +++ b/IdentityServer/v7/Apis/ResourceBasedApi/ResourceBasedApi.csproj @@ -5,10 +5,10 @@ - - + + - + diff --git a/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj b/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj index 82f38c3d..58de23a3 100755 --- a/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj +++ b/IdentityServer/v7/Apis/SimpleApi/SimpleApi.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/AspNetIdentity/Client/Client.csproj b/IdentityServer/v7/AspNetIdentity/Client/Client.csproj index 908a88bf..41179fef 100755 --- a/IdentityServer/v7/AspNetIdentity/Client/Client.csproj +++ b/IdentityServer/v7/AspNetIdentity/Client/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj index 7f3e5974..bcf4d045 100755 --- a/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj +++ b/IdentityServer/v7/AspNetIdentity/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj @@ -7,15 +7,15 @@ - + - - - - - - - + + + + + + + diff --git a/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj b/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj index 87817012..4b104991 100644 --- a/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj +++ b/IdentityServer/v7/AspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys/IdentityServerAspNetIdentityPasskeys.csproj @@ -6,14 +6,14 @@ - - + + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj b/IdentityServer/v7/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj index b02c9463..975d90b1 100644 --- a/IdentityServer/v7/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj +++ b/IdentityServer/v7/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/IdentityServer/v7/Basics/ClientCredentials/src/Client.csproj b/IdentityServer/v7/Basics/ClientCredentials/src/Client.csproj index 8e4e8a01..1c250640 100755 --- a/IdentityServer/v7/Basics/ClientCredentials/src/Client.csproj +++ b/IdentityServer/v7/Basics/ClientCredentials/src/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/Basics/Introspection/src/Client.csproj b/IdentityServer/v7/Basics/Introspection/src/Client.csproj index 79e18f11..93ce1604 100755 --- a/IdentityServer/v7/Basics/Introspection/src/Client.csproj +++ b/IdentityServer/v7/Basics/Introspection/src/Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Client.csproj b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Client.csproj index cee52a89..b5b6c44d 100755 --- a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Client.csproj +++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Client.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Program.cs b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Program.cs index f21331f5..d4f3623a 100755 --- a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Program.cs +++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/src/Program.cs @@ -62,7 +62,7 @@ static async Task RequestTokenAsync(SigningCredentials signingCre static string CreateClientToken(SigningCredentials credential, string clientId, string audience) { - var now = DateTime.UtcNow; + var now = DateTimeOffset.UtcNow; var token = new JwtSecurityToken( clientId, @@ -71,10 +71,10 @@ static string CreateClientToken(SigningCredentials credential, string clientId, { new Claim(JwtClaimTypes.JwtId, Guid.NewGuid().ToString()), new Claim(JwtClaimTypes.Subject, clientId), - new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64) + new Claim(JwtClaimTypes.IssuedAt, now.ToUnixTimeSeconds().ToString(), ClaimValueTypes.Integer64) }, - now, - now.AddMinutes(1), + now.UtcDateTime, + now.UtcDateTime.AddMinutes(1), credential ); diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj index ed9aa1af..6c0b9db9 100755 --- a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj b/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj index f7b69394..08911691 100755 --- a/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcBasic/src/Client.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionConfigurationService.cs b/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionConfigurationService.cs index 6f3dfa6c..5e05a046 100755 --- a/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionConfigurationService.cs +++ b/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionConfigurationService.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 System.Threading; using System.Threading.Tasks; using Duende.AccessTokenManagement; using Duende.IdentityModel; @@ -8,21 +9,16 @@ namespace Client; -public class ClientAssertionService : IClientAssertionService +public class ClientAssertionService(AssertionService assertionService) : IClientAssertionService { - private readonly AssertionService _assertionService; - - public ClientAssertionService(AssertionService assertionService) - { - _assertionService = assertionService; - } - - public Task GetClientAssertionAsync(string clientName = null, TokenRequestParameters parameters = null) + public Task GetClientAssertionAsync(ClientCredentialsClientName? clientName = null, + TokenRequestParameters parameters = null, + CancellationToken ct = new CancellationToken()) { var assertion = new ClientAssertion { Type = OidcConstants.ClientAssertionTypes.JwtBearer, - Value = _assertionService.CreateClientToken() + Value = assertionService.CreateClientToken() }; return Task.FromResult(assertion); diff --git a/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionService.cs b/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionService.cs index 695fad44..56bb8deb 100755 --- a/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionService.cs +++ b/IdentityServer/v7/Basics/MvcJarJwt/src/AssertionService.cs @@ -12,22 +12,15 @@ namespace Client; -public class AssertionService +public class AssertionService(IConfiguration configuration) { - private readonly IConfiguration _configuration; - - public AssertionService(IConfiguration configuration) - { - _configuration = configuration; - } - public string CreateClientToken() { - var now = DateTime.UtcNow; - var clientId = _configuration.GetValue("ClientId"); + var now = DateTimeOffset.UtcNow; + var clientId = configuration.GetValue("ClientId"); // in production you should load that key from some secure location - var key = _configuration.GetValue("Secrets:Key"); + var key = configuration.GetValue("Secrets:Key"); var token = new JwtSecurityToken( clientId, @@ -36,10 +29,10 @@ public string CreateClientToken() { new Claim(JwtClaimTypes.JwtId, Guid.NewGuid().ToString()), new Claim(JwtClaimTypes.Subject, clientId), - new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64) + new Claim(JwtClaimTypes.IssuedAt, now.ToUnixTimeSeconds().ToString(), ClaimValueTypes.Integer64) }, - now, - now.AddMinutes(1), + now.UtcDateTime, + now.UtcDateTime.AddMinutes(1), new SigningCredentials(new JsonWebKey(key), "RS256") ); @@ -54,10 +47,10 @@ public string CreateClientToken() public string SignAuthorizationRequest(OpenIdConnectMessage message) { var now = DateTime.UtcNow; - var clientId = _configuration.GetValue("ClientId"); + var clientId = configuration.GetValue("ClientId"); // in production you should load that key from some secure location - var key = _configuration.GetValue("Secrets:Key"); + var key = configuration.GetValue("Secrets:Key"); var claims = new List(); foreach (var parameter in message.Parameters) diff --git a/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj b/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj index 226f7ce7..ad90312d 100755 --- a/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcJarJwt/src/Client.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/IdentityServer/v7/Basics/MvcJarJwt/src/Program.cs b/IdentityServer/v7/Basics/MvcJarJwt/src/Program.cs index e76cac67..73281abe 100755 --- a/IdentityServer/v7/Basics/MvcJarJwt/src/Program.cs +++ b/IdentityServer/v7/Basics/MvcJarJwt/src/Program.cs @@ -5,6 +5,7 @@ using System.IdentityModel.Tokens.Jwt; using Client; using Duende.AccessTokenManagement; +using Duende.AccessTokenManagement.OpenIdConnect; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.OpenIdConnect; diff --git a/IdentityServer/v7/Basics/MvcPar/src/Client.csproj b/IdentityServer/v7/Basics/MvcPar/src/Client.csproj index 8cd6e265..ae97200d 100644 --- a/IdentityServer/v7/Basics/MvcPar/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcPar/src/Client.csproj @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Basics/MvcPar/src/Program.cs b/IdentityServer/v7/Basics/MvcPar/src/Program.cs index e376e6d3..a36802a7 100644 --- a/IdentityServer/v7/Basics/MvcPar/src/Program.cs +++ b/IdentityServer/v7/Basics/MvcPar/src/Program.cs @@ -3,6 +3,7 @@ using System; using Client; +using Duende.AccessTokenManagement.OpenIdConnect; using Duende.IdentityModel.Client; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj b/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj index 226f7ce7..ad90312d 100755 --- a/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs b/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs index 9d080822..e9994bd6 100755 --- a/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs +++ b/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs @@ -3,6 +3,7 @@ using System; using Client; +using Duende.AccessTokenManagement.OpenIdConnect; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; diff --git a/IdentityServer/v7/Basics/Shared/TokenResponseExtensions.cs b/IdentityServer/v7/Basics/Shared/TokenResponseExtensions.cs index ce7c3ba1..ab40ca3d 100755 --- a/IdentityServer/v7/Basics/Shared/TokenResponseExtensions.cs +++ b/IdentityServer/v7/Basics/Shared/TokenResponseExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using System; +using System.Buffers.Text; using System.Diagnostics; using System.Text; using System.Text.Json; @@ -27,8 +28,8 @@ public static void Show(this TokenResponse response) var header = parts[0]; var claims = parts[1]; - Console.WriteLine(PrettyPrintJson(Encoding.UTF8.GetString(Base64Url.Decode(header)))); - Console.WriteLine(PrettyPrintJson(Encoding.UTF8.GetString(Base64Url.Decode(claims)))); + Console.WriteLine(PrettyPrintJson(Encoding.UTF8.GetString(Base64Url.DecodeFromChars(header)))); + Console.WriteLine(PrettyPrintJson(Encoding.UTF8.GetString(Base64Url.DecodeFromChars(claims)))); } } else diff --git a/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj b/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj index 1036efaa..a78af59a 100644 --- a/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj +++ b/IdentityServer/v7/Configuration/IdentityServerHost/IdentityServer.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj index dcfa8241..5db2b431 100644 --- a/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/Permissions/Configuration/Configuration.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj b/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj index 840aceb1..98d847bb 100644 --- a/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj +++ b/IdentityServer/v7/Configuration/Permissions/ConsoleDcrClient/ConsoleDcrClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj index de9552a5..51b159d3 100644 --- a/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/PipelineRegistration/Configuration/Configuration.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj b/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj index 7dcfa89b..f1956046 100644 --- a/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj +++ b/IdentityServer/v7/Configuration/PipelineRegistration/ConsoleDcrClient/ConsoleDcrClient.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj index dcfa8241..5db2b431 100644 --- a/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/SimpleDcr/Configuration/Configuration.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Configuration/SimpleDcr/ConsoleDcrClient/ConsoleDcrClient.csproj b/IdentityServer/v7/Configuration/SimpleDcr/ConsoleDcrClient/ConsoleDcrClient.csproj index 840aceb1..98d847bb 100644 --- a/IdentityServer/v7/Configuration/SimpleDcr/ConsoleDcrClient/ConsoleDcrClient.csproj +++ b/IdentityServer/v7/Configuration/SimpleDcr/ConsoleDcrClient/ConsoleDcrClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj b/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj index dcfa8241..5db2b431 100644 --- a/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj +++ b/IdentityServer/v7/Configuration/SoftwareStatement/Configuration/Configuration.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Configuration/SoftwareStatement/ConsoleDcrClient/ConsoleDcrClient.csproj b/IdentityServer/v7/Configuration/SoftwareStatement/ConsoleDcrClient/ConsoleDcrClient.csproj index bee4d050..bb58f666 100644 --- a/IdentityServer/v7/Configuration/SoftwareStatement/ConsoleDcrClient/ConsoleDcrClient.csproj +++ b/IdentityServer/v7/Configuration/SoftwareStatement/ConsoleDcrClient/ConsoleDcrClient.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/DPoP/Api/Api.csproj b/IdentityServer/v7/DPoP/Api/Api.csproj index 97d3fede..a4e387c0 100644 --- a/IdentityServer/v7/DPoP/Api/Api.csproj +++ b/IdentityServer/v7/DPoP/Api/Api.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/IdentityServer/v7/DPoP/Api/Program.cs b/IdentityServer/v7/DPoP/Api/Program.cs index e5f35336..57f9bfe3 100644 --- a/IdentityServer/v7/DPoP/Api/Program.cs +++ b/IdentityServer/v7/DPoP/Api/Program.cs @@ -19,6 +19,13 @@ builder.Services.AddControllers(); builder.Services.AddCors(); +// Register in-memory distributed cache +// This is fine for demos, but in production, consider using Redis or another distributed cache +builder.Services.AddDistributedMemoryCache(); + +// Register keyed HybridCache +builder.Services.AddKeyedHybridCache(ServiceProviderKeys.ProofTokenReplayHybridCache); + // this API will accept any access token from the authority builder.Services.AddAuthentication("token") .AddJwtBearer("token", options => diff --git a/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj b/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj index b8e4aab7..63b09335 100644 --- a/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj +++ b/IdentityServer/v7/DPoP/ClientCredentials/ClientCredentials.csproj @@ -6,8 +6,8 @@ - - - + + + diff --git a/IdentityServer/v7/DPoP/WebClient/WebClient.csproj b/IdentityServer/v7/DPoP/WebClient/WebClient.csproj index 9758b159..cf9d37d9 100644 --- a/IdentityServer/v7/DPoP/WebClient/WebClient.csproj +++ b/IdentityServer/v7/DPoP/WebClient/WebClient.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj index 65f05489..dcea4252 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.ApiService/Aspire.ApiService.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj index 0ca64c66..df9d4578 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj @@ -1,6 +1,6 @@ - + Exe @@ -16,7 +16,7 @@ - + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj index e0f3d2c6..0adcdc6f 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj index 7814976d..8e197e34 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.Web/Aspire.Web.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj index 443f1bd3..5a2671ca 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/IdentityServer/IdentityServer.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj b/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj index 1b395a84..e0aca292 100644 --- a/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj +++ b/IdentityServer/v7/Diagnostics/Otel/src/Otel.csproj @@ -6,17 +6,17 @@ - - + + - - - - - - - + + + + + + + diff --git a/IdentityServer/v7/Directory.Packages.props b/IdentityServer/v7/Directory.Packages.props new file mode 100644 index 00000000..76787b1c --- /dev/null +++ b/IdentityServer/v7/Directory.Packages.props @@ -0,0 +1,61 @@ + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj b/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj index f4d498ef..7ff6b6d4 100755 --- a/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj +++ b/IdentityServer/v7/IdentityServerHost/src/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/MTLS/Api/Api.csproj b/IdentityServer/v7/MTLS/Api/Api.csproj index b5663dc2..6ff5700c 100644 --- a/IdentityServer/v7/MTLS/Api/Api.csproj +++ b/IdentityServer/v7/MTLS/Api/Api.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj b/IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj index aeb4b60b..297de3c8 100644 --- a/IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj +++ b/IdentityServer/v7/MTLS/ClientCredentials/ClientCredentials.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj index 2c5bc901..5dc0a46b 100644 --- a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj b/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj index aeba364e..acd394f6 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.Client/McpDemo.Client.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj b/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj index f8d17ad4..ed4523c7 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.IdentityServer/McpDemo.IdentityServer.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj b/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj index 0b25522d..5e9abafb 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.McpServer/McpDemo.McpServer.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/McpDemo/McpDemo.McpServer/Program.cs b/IdentityServer/v7/McpDemo/McpDemo.McpServer/Program.cs index 49f96685..8d40db63 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.McpServer/Program.cs +++ b/IdentityServer/v7/McpDemo/McpDemo.McpServer/Program.cs @@ -31,9 +31,9 @@ { options.ResourceMetadata = new() { - Resource = new Uri(serverUrl), - ResourceDocumentation = new Uri("https://docs.example/api/weather"), - AuthorizationServers = { new Uri(inMemoryOAuthServerUrl) }, + Resource = serverUrl, + ResourceDocumentation = "https://docs.example/api/weather", + AuthorizationServers = [inMemoryOAuthServerUrl], ScopesSupported = ["mcp:tools"] }; }); diff --git a/IdentityServer/v7/PAT/Api/Api.csproj b/IdentityServer/v7/PAT/Api/Api.csproj index 0e5c7a5a..303a83a7 100644 --- a/IdentityServer/v7/PAT/Api/Api.csproj +++ b/IdentityServer/v7/PAT/Api/Api.csproj @@ -6,9 +6,9 @@ - - + + - + diff --git a/IdentityServer/v7/PAT/Client/Client.csproj b/IdentityServer/v7/PAT/Client/Client.csproj index 1340bf46..dc0fc534 100644 --- a/IdentityServer/v7/PAT/Client/Client.csproj +++ b/IdentityServer/v7/PAT/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj index c948f3e7..7ff6b6d4 100644 --- a/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/PAT/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/1_ClientCredentials/src/Api/Api.csproj index 580b2c3a..f340ba06 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 4e30c707..32044da5 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 6902928f..98c0f92a 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 580b2c3a..f340ba06 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 4e30c707..32044da5 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/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/IdentityServer/IdentityServer.csproj index cad02a94..8b4ac349 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/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/2_InteractiveAspNetCore/src/WebClient/WebClient.csproj index 06d6e28a..77001a3d 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 580b2c3a..f340ba06 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 4e30c707..32044da5 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 eac704a1..af2437f8 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/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/3_AspNetCoreAndApis/src/WebClient/WebClient.csproj index 06d6e28a..77001a3d 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 580b2c3a..f340ba06 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 4e30c707..32044da5 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 cad02a94..8b4ac349 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/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/3a_TokenManagement/src/WebClient/WebClient.csproj index cb4db5be..88bd53bf 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 580b2c3a..f340ba06 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 4e30c707..32044da5 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 712cbb90..6d73f331 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/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/4_EntityFramework/src/WebClient/WebClient.csproj index 06d6e28a..77001a3d 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 580b2c3a..f340ba06 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 4e30c707..32044da5 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 60945e11..3f76418f 100644 --- a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj +++ b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/IdentityServerAspNetIdentity/IdentityServerAspNetIdentity.csproj @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/5_AspNetIdentity/src/WebClient/WebClient.csproj index 06d6e28a..77001a3d 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 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj index 580b2c3a..f340ba06 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Client/Client.csproj index 4e30c707..32044da5 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Client/Client.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/Client/Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj index cad02a94..8b4ac349 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/IdentityServer/IdentityServer.csproj @@ -7,8 +7,8 @@ - - - + + + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj index f1bc0925..71de880f 100644 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/JavaScriptClient/JavaScriptClient.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj index 06d6e28a..77001a3d 100644 --- a/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_with_backend/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj index 580b2c3a..f340ba06 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Api/Api.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Client/Client.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Client/Client.csproj index 4e30c707..32044da5 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Client/Client.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/Client/Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj index cad02a94..8b4ac349 100755 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/IdentityServer/IdentityServer.csproj @@ -7,8 +7,8 @@ - - - + + + diff --git a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj index 06d6e28a..77001a3d 100644 --- a/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj +++ b/IdentityServer/v7/Quickstarts/6_JS_without_backend/src/WebClient/WebClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj b/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj index 125fad25..ef6fafb5 100644 --- a/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj +++ b/IdentityServer/v7/Quickstarts/7_Blazor/BFF/BFF.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj b/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj index 052f812b..08475e44 100644 --- a/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj +++ b/IdentityServer/v7/Quickstarts/7_Blazor/BlazorWasm/BlazorWasm.csproj @@ -8,14 +8,14 @@ - - - - + + + + - + \ No newline at end of file diff --git a/IdentityServer/v7/ScopesAndResources/Client/Client.csproj b/IdentityServer/v7/ScopesAndResources/Client/Client.csproj index f5582393..519b5e60 100644 --- a/IdentityServer/v7/ScopesAndResources/Client/Client.csproj +++ b/IdentityServer/v7/ScopesAndResources/Client/Client.csproj @@ -7,6 +7,6 @@ - + diff --git a/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj index 236ac1ee..f2c5414d 100644 --- a/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/ScopesAndResources/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - + - + diff --git a/IdentityServer/v7/SessionManagement/Client/Client.csproj b/IdentityServer/v7/SessionManagement/Client/Client.csproj index 44bedd1d..04a6612e 100644 --- a/IdentityServer/v7/SessionManagement/Client/Client.csproj +++ b/IdentityServer/v7/SessionManagement/Client/Client.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj index 0eeb00dd..c2e06155 100644 --- a/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/SessionManagement/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj b/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj index 95f70e3f..299ad745 100644 --- a/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj +++ b/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,6 +9,7 @@ + diff --git a/IdentityServer/v7/SessionMigration/SessionMigration.csproj b/IdentityServer/v7/SessionMigration/SessionMigration.csproj index c4f4279b..fbb0edbd 100644 --- a/IdentityServer/v7/SessionMigration/SessionMigration.csproj +++ b/IdentityServer/v7/SessionMigration/SessionMigration.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/IdentityServer/v7/TokenExchange/Client/Client.csproj b/IdentityServer/v7/TokenExchange/Client/Client.csproj index f5582393..519b5e60 100644 --- a/IdentityServer/v7/TokenExchange/Client/Client.csproj +++ b/IdentityServer/v7/TokenExchange/Client/Client.csproj @@ -7,6 +7,6 @@ - + diff --git a/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj index 17c7b763..eff64d09 100644 --- a/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/TokenExchange/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj b/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj index 7c20cbd5..e5ffe706 100644 --- a/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj +++ b/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,6 +9,7 @@ + diff --git a/IdentityServer/v7/UserInteraction/Ciba/Client/Client.csproj b/IdentityServer/v7/UserInteraction/Ciba/Client/Client.csproj index 5191c825..15e689e2 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/Ciba/Client/Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj index 0840125a..f9ee1c85 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -8,7 +8,9 @@ 289847f7-34b8-436c-af32-3bf4c68e266f + + diff --git a/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj index fd5e4ba2..c2d7ebdb 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/Ciba/IdentityServerHost/IdentityServerHost.csproj @@ -6,7 +6,7 @@ - + diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj index 459fa68a..57fd075f 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj index e111752b..5d565a15 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj @@ -6,12 +6,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj b/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj index 7f7bbdb9..401a52fa 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/Api/Api.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj b/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj index 8ab23cfd..27b0f887 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/Client/Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj index f4d498ef..7ff6b6d4 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj b/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj index 63c3e61b..3d338a23 100644 --- a/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/SpaLoginUi/Client/Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj index ae3e3a9d..90a6d870 100644 --- a/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/SpaLoginUi/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj b/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj index 77eb08c9..b9ec97a7 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/Api/Api.csproj @@ -5,8 +5,8 @@ enable - - - + + + diff --git a/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj b/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj index 9a5418d1..2dfc4ba9 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/Client/Client.csproj @@ -5,8 +5,8 @@ enable - - - + + + diff --git a/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj index ae3e3a9d..90a6d870 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj b/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj index 63c3e61b..3d338a23 100644 --- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/Client/Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj index ab4249a0..146240b3 100644 --- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/IdentityServerHost/IdentityServerHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj index 459fa68a..57fd075f 100644 --- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/Client/Client.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj index 9dc7c1b9..c59fa123 100755 --- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/IdentityServerHost.csproj @@ -6,12 +6,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/samples.slnx b/samples.slnx index 9b456fe8..45eb4024 100644 --- a/samples.slnx +++ b/samples.slnx @@ -126,6 +126,7 @@ + @@ -299,6 +300,7 @@ + @@ -502,6 +504,7 @@ +