diff --git a/Directory.Packages.props b/Directory.Packages.props index 8c831008f..f910a1a74 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,7 +39,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -85,9 +85,9 @@ - - - + + + diff --git a/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config b/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config index 4d8a81c13..611c0da51 100644 --- a/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config +++ b/sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config @@ -55,7 +55,7 @@ - + diff --git a/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config b/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config index 0d83dfde8..96487957c 100644 --- a/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config +++ b/sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config @@ -61,25 +61,25 @@ - + - + - + - + diff --git a/src/OpenIddict.Client.Owin/OpenIddictClientOwinConfiguration.cs b/src/OpenIddict.Client.Owin/OpenIddictClientOwinConfiguration.cs index 701f721b2..1c1ca226e 100644 --- a/src/OpenIddict.Client.Owin/OpenIddictClientOwinConfiguration.cs +++ b/src/OpenIddict.Client.Owin/OpenIddictClientOwinConfiguration.cs @@ -54,8 +54,7 @@ public void PostConfigure(string? name, OpenIddictClientOwinOptions options) options.CookieManager ??= _provider.GetService() switch { // See https://github.com/aspnet/AspNetKatana/pull/486 for more information. - IAppBuilder builder when builder.Properties.TryGetValue("infrastructure.CookieManager", - out object? property) && property is ICookieManager manager => manager, + IAppBuilder builder => builder.GetDefaultCookieManager(), _ => new CookieManager() }; @@ -69,9 +68,9 @@ IAppBuilder builder when builder.Properties.TryGetValue("infrastructure.CookieMa { foreach (var (provider, registrations) in _provider.GetRequiredService>() .CurrentValue.Registrations - .Where(registration => !string.IsNullOrEmpty(registration.ProviderName)) - .GroupBy(registration => registration.ProviderName) - .Select(group => (ProviderName: group.Key, Registrations: group.ToList()))) + .Where(static registration => !string.IsNullOrEmpty(registration.ProviderName)) + .GroupBy(static registration => registration.ProviderName) + .Select(static group => (ProviderName: group.Key, Registrations: group.ToList()))) { // If an explicit mapping was already added, don't overwrite it. if (options.ForwardedAuthenticationTypes.Exists(type =>