diff --git a/Directory.Packages.props b/Directory.Packages.props index 8bedbf588ad5..5a8717576b91 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,28 +12,28 @@ - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -58,9 +58,9 @@ - - - + + + @@ -69,7 +69,7 @@ - + @@ -81,6 +81,8 @@ + + @@ -88,9 +90,9 @@ - + - + diff --git a/global.json b/global.json index 9c2a1357434e..1ada74259840 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100-rc.1.24452.12", + "version": "9.0.100-rc.2.24474.11", "rollForward": "latestFeature", "allowPrerelease": true } diff --git a/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs b/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs index f34fc2dde916..1558329746a0 100644 --- a/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs +++ b/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderAuthExtensions.cs @@ -41,7 +41,7 @@ private static void ConfigureOpenIddict(IUmbracoBuilder builder) .SetTokenEndpointUris( Paths.MemberApi.TokenEndpoint.TrimStart(Constants.CharArrays.ForwardSlash), Paths.BackOfficeApi.TokenEndpoint.TrimStart(Constants.CharArrays.ForwardSlash)) - .SetLogoutEndpointUris( + .SetEndSessionEndpointUris( Paths.MemberApi.LogoutEndpoint.TrimStart(Constants.CharArrays.ForwardSlash), Paths.BackOfficeApi.LogoutEndpoint.TrimStart(Constants.CharArrays.ForwardSlash)) .SetRevocationEndpointUris( @@ -62,7 +62,7 @@ private static void ConfigureOpenIddict(IUmbracoBuilder builder) .UseAspNetCore() .EnableAuthorizationEndpointPassthrough() .EnableTokenEndpointPassthrough() - .EnableLogoutEndpointPassthrough(); + .EnableEndSessionEndpointPassthrough(); // Enable reference tokens // - see https://documentation.openiddict.com/configuration/token-storage.html diff --git a/src/Umbraco.Cms.Api.Delivery/Security/MemberApplicationManager.cs b/src/Umbraco.Cms.Api.Delivery/Security/MemberApplicationManager.cs index 67cfb4b7cf76..9cfd7b78e153 100644 --- a/src/Umbraco.Cms.Api.Delivery/Security/MemberApplicationManager.cs +++ b/src/Umbraco.Cms.Api.Delivery/Security/MemberApplicationManager.cs @@ -41,7 +41,7 @@ public async Task EnsureMemberApplicationAsync(IEnumerable loginRedirectUrl { OpenIddictConstants.Permissions.Endpoints.Authorization, OpenIddictConstants.Permissions.Endpoints.Token, - OpenIddictConstants.Permissions.Endpoints.Logout, + OpenIddictConstants.Permissions.Endpoints.EndSession, OpenIddictConstants.Permissions.Endpoints.Revocation, OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode, OpenIddictConstants.Permissions.GrantTypes.RefreshToken, diff --git a/src/Umbraco.Cms.Api.Management/Security/BackOfficeApplicationManager.cs b/src/Umbraco.Cms.Api.Management/Security/BackOfficeApplicationManager.cs index 36fe1b0acce5..cbf0fcd8addb 100644 --- a/src/Umbraco.Cms.Api.Management/Security/BackOfficeApplicationManager.cs +++ b/src/Umbraco.Cms.Api.Management/Security/BackOfficeApplicationManager.cs @@ -132,7 +132,7 @@ public OpenIddictApplicationDescriptor BackofficeOpenIddictApplicationDescriptor { OpenIddictConstants.Permissions.Endpoints.Authorization, OpenIddictConstants.Permissions.Endpoints.Token, - OpenIddictConstants.Permissions.Endpoints.Logout, + OpenIddictConstants.Permissions.Endpoints.EndSession, OpenIddictConstants.Permissions.Endpoints.Revocation, OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode, OpenIddictConstants.Permissions.GrantTypes.RefreshToken, diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj index a1864f636fe9..264cf02579ea 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj @@ -6,8 +6,12 @@ + + + + diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj index 3c489dbb109d..f80f35689bcb 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj @@ -16,6 +16,8 @@ + + diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index 52076f4562e1..e6c801fe6b3a 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -13,7 +13,8 @@ - + + diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml index 716521066c87..856796cd25ee 100644 --- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml +++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoLogin/Index.cshtml @@ -31,6 +31,7 @@ var allowPasswordReset = SecuritySettings.Value.AllowPasswordReset && EmailSender.CanSendRequiredEmail(); var disableLocalLogin = ExternalLogins.HasDenyLocalLogin(); } +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @@ -44,7 +45,7 @@ Umbraco - + @await Html.BackOfficeImportMapScriptAsync(JsonSerializer, BackOfficePathGenerator, PackageManifestService) - + diff --git a/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs index c8e93b635175..191927ba377d 100644 --- a/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.PublishedCache.HybridCache/DependencyInjection/UmbracoBuilderExtensions.cs @@ -29,7 +29,9 @@ public static class UmbracoBuilderExtensions /// public static IUmbracoBuilder AddUmbracoHybridCache(this IUmbracoBuilder builder) { +#pragma warning disable EXTEXP0018 builder.Services.AddHybridCache(); +#pragma warning restore EXTEXP0018 builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index a3b4ceff478c..3b4a2714b8ff 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -5,12 +5,12 @@ - - + + - - + + @@ -22,4 +22,4 @@ - + \ No newline at end of file